summaryrefslogtreecommitdiff
path: root/git-annotate.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-01 17:05:57 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-01 17:05:57 -0800
commit145c9a60ad81477749a86acdf250d9e20742dcad (patch)
treeb82ee48c7fe16d9d712a64a4d87a3446b326c05b /git-annotate.perl
parent6be65bbc958e8d7c57bc81ae7035119b8b1afbab (diff)
parent8c31cb822f387d7bc51b51cbacd08d62faed4faa (diff)
downloadgit-145c9a60ad81477749a86acdf250d9e20742dcad.tar.gz
Merge branch 'lt/apply'
* lt/apply: git-am: --whitespace=x option. git-apply: war on whitespace -- finishing touches. git-apply --whitespace=nowarn apply --whitespace: configuration option. apply: squelch excessive errors and --whitespace=error-all apply --whitespace fixes and enhancements. The war on trailing whitespace
Diffstat (limited to 'git-annotate.perl')
0 files changed, 0 insertions, 0 deletions