projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c252ef 095ce95)
Merge branch 'jc/fix-diff-files-unmerged'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:52:58 +0000 (10:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:52:58 +0000 (10:52 -0700)
commit22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593
tree0091b831de88064187f0ddfd637b8ff93883ededtree | snapshot
parent6c252ef79e314eef8fca862cca8a63329fa7591ccommit | diff
parent095ce9538b738db28d5e9a6e05d94c7e3f55f39dcommit | diff
Merge branch 'jc/fix-diff-files-unmerged'

* jc/fix-diff-files-unmerged:
  diff-files: show unmerged entries correctly
  diff: remove often unused parameters from diff_unmerge()
  diff.c: return filepair from diff_unmerge()
  test: use $_z40 from test-lib
diff-lib.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
diff.h diff1 | diff2 | blob | history
t/t1400-update-ref.sh diff1 | diff2 | blob | history
t/t1501-worktree.sh diff1 | diff2 | blob | history
t/t3200-branch.sh diff1 | diff2 | blob | history
t/t3600-rm.sh diff1 | diff2 | blob | history
t/t4002-diff-basic.sh diff1 | diff2 | blob | history
t/t4027-diff-submodule.sh diff1 | diff2 | blob | history
t/t7012-skip-worktree-writing.sh diff1 | diff2 | blob | history
t/test-lib.sh diff1 | diff2 | blob | history
Git—the stupid content tracker