Merge branch 'maint' into bc/master-diff-hunk-header-fix
authorShawn O. Pearce <spearce@spearce.org>
Mon, 29 Sep 2008 17:52:34 +0000 (10:52 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 29 Sep 2008 17:52:34 +0000 (10:52 -0700)
commit5a139ba...83efea47e103fef47afe87157e3bba77
tree9b387ac...fb4bd7b886d2a1b05e18832ad079bff9copy hash to clipboard (tree)
parentfdac669...a0b0eda293f9f1bf4bc49b05b29f3c45copy hash to clipboard (diff)
parentedb7e82...72106add9f2fbaf9d99d9532a72e3f91copy hash to clipboard (diff)
16 files changed:
Documentation/config.txt
Documentation/gitattributes.txt
builtin-checkout.c
builtin-commit.c
builtin-log.c
builtin-merge-recursive.c
builtin-merge.c
contrib/completion/git-completion.bash
diff.c
dir.c
fast-import.c
git-submodule.sh
git-svn.perl
gitweb/gitweb.perl
read-cache.c
sha1_file.c