summaryrefslogtreecommitdiffstats
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-28 09:16:09 +0100
committerJunio C Hamano <junkio@cox.net>2006-01-28 09:16:09 +0100
commitaddafaf92eeb86033da91323d0d3ad7a496dae83 (patch)
treee3be15f54f01e3aa1f8ec830ac87da5f85a23480 /diff.h
parentmerge: seed the commit message with list of conflicted files. (diff)
parentrev-list --remove-empty: add minimum help and doc entry. (diff)
parentdiff-files: -c and --cc options. (diff)
parentrev-parse: make "whatchanged -- git-fetch-script" work again. (diff)
parentdiff --abbrev=<n> option fix. (diff)
downloadgit-addafaf92eeb86033da91323d0d3ad7a496dae83.tar.xz
git-addafaf92eeb86033da91323d0d3ad7a496dae83.zip
Merge lt/revlist,jc/diff,jc/revparse,jc/abbrev