Package: git-man
Version: 1:1.8.4.2-1
Severity: minor
Justification: documentation
Tags: upstream
As reported by elplatt on #git:
elplatt | Can anyone explain what the "parent line" is when using git revert
| on a merge commit?
_ikke_ | elplatt: It means which parent to choose from
elplatt | _ikke_ how can I know which is which?
CareBear\ | elplatt : git show and git log ?
elplatt | It looks like the expected value is something like "1" instead of
| a commit hash
elplatt | I'm not sure what that represents.
elplatt | TFM says "This option specifies the parent number (starting from 1)
| of the mainline" but I'm not sure what that means.
moritz | well, the parents are ordered
moritz | and if you do a 'git log' or 'git show', they are displayed always
| in the same order
moritz | and the "parent number" is an index into this ordered list
elplatt | ah, so if it says "Merge: abc def" then abc is 1 and def is 2?
moritz | elplatt: yes
elplatt | Awesome, thanks moritz!
* | moritz probably found the most technical description possible :-)
jrnieder | elplatt: I agree that what the doc says is pretty unenlightening :)
jrnieder | elplatt: maybe what's needed is a summary of
| howto/revert-a-faulty-merge.txt in the EXAMPLES section
elplatt | That would be helpful :) It's just that one connection between
| the index and the commit hash that's missing.
elplatt | There's a good example here, but it doesn't explain that part:
| http://git-scm.com/blog/2010/03/02/undoing-merges.html
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
