| commit | 76482939ecca84ff22727a4c117fb09794efaa0e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jul 2014 18:00:55 +0000 (22 11:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jul 2014 18:00:56 +0000 (22 11:00 -0700) | ||
| tree | da5db8caa0446af1049e1a2542ae02f315547fb0 | treesnapshot (tar.gz zip) |
| parent | 46e9bc3cddf0f11657a96d3376b8fd3ceb1588a3 | commitdiff |
| parent | 1e0dacdbdb751caa5936b6d1510f5e8db4d1ed5f | commitdiff |
Merge branch 'jk/rebase-am-fork-point' into next
"git rebase --fork-point" did not filter out patch-identical
commits correctly.
* jk/rebase-am-fork-point:
rebase: omit patch-identical commits with --fork-point
rebase--am: use --cherry-pick instead of --ignore-if-in-upstream
"git rebase --fork-point" did not filter out patch-identical
commits correctly.
* jk/rebase-am-fork-point:
rebase: omit patch-identical commits with --fork-point
rebase--am: use --cherry-pick instead of --ignore-if-in-upstream
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| git-rebase.sh | diff1 | diff2 | blobhistory |