]> git.ipfire.org Git - thirdparty/git.git/commit - po/es.po
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1fc3c0a a79c6b6)
Merge branch 'rs/diff-caret-bang-with-parents'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2022 00:11:43 +0000 (17:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2022 00:11:43 +0000 (17:11 -0700)
commitb988427918c767fc7782a387c9c8de9e147b983d
tree4828e30bcbaae1c5c683bea9506c08a55911c6fftree | snapshot
parent1fc3c0ad407008c2f71dd9ae1241d8b75f8ef886commit | diff
parenta79c6b60817c74534815bf132f0b26aa8e325874commit | diff
Merge branch 'rs/diff-caret-bang-with-parents'

"git diff rev^!" did not show combined diff to go to the rev from
its parents.

* rs/diff-caret-bang-with-parents:
  diff: support ^! for merges
  revisions.txt: unspecify order of resolved parts of ^!
  revision: use strtol_i() for exclude_parent
Documentation/git-diff.txt diff1 | diff2 | blob | history
revision.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.