aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing/format/index/index.go
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2017-02-07 15:23:57 +0100
committerGitHub <noreply@github.com>2017-02-07 15:23:57 +0100
commit431af32445562b389397f3ee7af90bf61455fff1 (patch)
tree11ad4dfafd66e7f499307afb99a267d5d8763140 /plumbing/format/index/index.go
parentd0cf20797464ab12b41ccb5c603f67884a6e8e17 (diff)
downloadgo-git-431af32445562b389397f3ee7af90bf61455fff1.tar.gz
package plumbing documentation improvements (#248)
Diffstat (limited to 'plumbing/format/index/index.go')
-rw-r--r--plumbing/format/index/index.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/plumbing/format/index/index.go b/plumbing/format/index/index.go
index 0e9132f..e5dc178 100644
--- a/plumbing/format/index/index.go
+++ b/plumbing/format/index/index.go
@@ -93,10 +93,10 @@ type TreeEntry struct {
Hash plumbing.Hash
}
-// ResolveUndo when a conflict is resolved (e.g. with "git add path"), these
-// higher stage entries will be removed and a stage-0 entry with proper
+// ResolveUndo is used when a conflict is resolved (e.g. with "git add path"),
+// these higher stage entries are removed and a stage-0 entry with proper
// resolution is added. When these higher stage entries are removed, they are
-// saved in the resolve undo extension
+// saved in the resolve undo extension.
type ResolveUndo struct {
Entries []ResolveUndoEntry
}