aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-18 13:53:48 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-18 13:53:48 -0700
commit82c41a9bfc843aa2a6e286bcb917b0436714ebd4 (patch)
treefeaa3599c95da8400b179a5618443c66125ee3c6 /diff.c
parentMerge branch 'jc/reflog-doc' (diff)
parentgit-merge: document the -S option (diff)
downloadgit-82c41a9bfc843aa2a6e286bcb917b0436714ebd4.tar.gz
git-82c41a9bfc843aa2a6e286bcb917b0436714ebd4.zip
Merge branch 'maint'
* maint: git-merge: document the -S option
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions