| commit | 05b4df31537a653eaa30d2c6f53e05d7a12d1bc8 | |
| author | Lars Hjemli <hjemli@gmail.com> | |
| Wed, 5 Sep 2007 09:35:29 +0000 (5 11:35 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Sep 2007 22:24:16 +0000 (5 15:24 -0700) | ||
| tree | b0e4835df071c35810a92444b222f7a30a7c3825 | treesnapshot (tar.gz zip) |
| parent | ad00a3b8f8cabcf20aa6ac84ac88bea035fa7ce7 | commitdiff |
git-svn: add support for --first-parent
When git-svn uses git-log to find embedded 'git-svn-id'-lines in commit
messages, it can get confused when local history contains merges with
other git-svn branches. But if --first-parent is supplied to git-log,
working_head_info() will only see 'branch-local' commits and thus the
first commit containing a 'git-svn-id' line should refer to the correct
subversion branch.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When git-svn uses git-log to find embedded 'git-svn-id'-lines in commit
messages, it can get confused when local history contains merges with
other git-svn branches. But if --first-parent is supplied to git-log,
working_head_info() will only see 'branch-local' commits and thus the
first commit containing a 'git-svn-id' line should refer to the correct
subversion branch.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-svn.txt | diffblobblamehistory | |
| git-svn.perl | diffblobblamehistory |