| commit | 3dcacd7797082cb8e6f3c10970e18dd843433e3a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 27 Jul 2014 22:14:21 +0000 (27 15:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 27 Jul 2014 22:14:21 +0000 (27 15:14 -0700) | ||
| tree | 5dce98361218d7d04b7d3cced3170fb14e5cca63 | treesnapshot (tar.gz zip) |
| parent | 16737445a94cb9b18378fff973129d974c7cdf8a | commitdiff |
| parent | 1e0dacdbdb751caa5936b6d1510f5e8db4d1ed5f | commitdiff |
Merge branch 'jk/rebase-am-fork-point'
"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