summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-22 21:38:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-22 21:38:50 -0700
commitaeb2aaa7712f7af8237d5bceb725a7db8c2d4620 (patch)
tree179be08e021c12d073818ca78bc63846b10da8a5 /xdiff-interface.c
parentMerge branch 'js/maint-stash-index-copy' (diff)
parentgit-log: put space after commit mark (diff)
downloadtgif-aeb2aaa7712f7af8237d5bceb725a7db8c2d4620.tar.xz
Merge branch 'mg/rev-list-one-side-only'
* mg/rev-list-one-side-only: git-log: put space after commit mark t6007: test rev-list --cherry log --cherry: a synonym rev-list: documentation and test for --cherry-mark revision.c: introduce --cherry-mark rev-list/log: factor out revision mark generation rev-list: --left/right-only are mutually exclusive rev-list: documentation and test for --left/right-only t6007: Make sure we test --cherry-pick revlist.c: introduce --left/right-only for unsymmetric picking
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions