diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2007-04-08 00:59:19 -0700 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-04-08 19:53:54 -0700 |
| commit | 13c823fb520eaf1cded520213cf0ae4c3268208d (patch) | |
| tree | 41699dbb63214bddadd0bb25948b93a940997fbd /Documentation/git-merge-index.txt | |
| parent | git-svn: bail out on incorrect command-line options (diff) | |
| download | tgif-13c823fb520eaf1cded520213cf0ae4c3268208d.tar.xz | |
git-svn: dcommit/rebase confused by patches with git-svn-id: lines
When patches are merged from another git-svn managed branch,
they will have the git-svn-id: metadata line in them (generated
by git-format-patch).
When doing rebase or dcommit via git-svn, this would cause
git-svn to find the wrong upstream branch. We now verify
that the commit is consistent with the value in the .rev_db
file.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions