]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1673744 1e0dacd)
Merge branch 'jk/rebase-am-fork-point'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Jul 2014 22:14:21 +0000 (15:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jul 2014 22:14:21 +0000 (15:14 -0700)
"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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.