summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t7060: actually test "git diff-index --cached -M"mp/t7060-diff-index-testMatthieu Prat2015-09-021-1/+1
* diffcore-rename: don't consider unmerged path as sourceMartin von Zweigbergk2011-03-232-2/+67
* Merge branch 'maint-1.7.2' into maint-1.7.3Junio C Hamano2011-02-163-20/+26
|\
| * Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2011-02-163-20/+26
| |\
| | * Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2011-02-163-20/+26
| | |\
| | | * fast-import: introduce "feature notes" commandJonathan Nieder2011-02-093-0/+9
| | | * fast-import: clarify documentation of "feature" commandJonathan Nieder2011-02-091-20/+17
* | | | rebase -i: clarify in-editor documentation of "exec"ko-maintJonathan Nieder2011-01-271-1/+1
* | | | tests: sanitize more git environment variablesJeff King2011-01-271-0/+3
* | | | Merge branch 'jn/fast-import-empty-tree-removal' into maintJunio C Hamano2011-01-272-0/+48
|\ \ \ \
| * | | | fast-import: treat filemodify with empty tree as deleteJonathan Nieder2011-01-272-0/+48
* | | | | rebase: give a better error message for bogus branchJeff King2011-01-261-0/+1
* | | | | rebase: use explicit "--" with checkoutJeff King2011-01-262-2/+2
* | | | | exec_cmd: remove unused externErik Faye-Lund2011-01-191-1/+0
* | | | | Merge branch 'jn/gitweb-no-logo' into maintJunio C Hamano2011-01-191-4/+9
|\ \ \ \ \
| * | | | | gitweb: make logo optionalJonathan Nieder2011-01-041-4/+9
* | | | | | Merge branch 'jk/diff-driver-binary-doc' into maintJunio C Hamano2011-01-191-0/+33
|\ \ \ \ \ \
| * | | | | | docs: explain diff.*.binary optionJeff King2011-01-101-0/+33
* | | | | | | Merge branch 'tr/submodule-relative-scp-url' into maintJunio C Hamano2011-01-192-2/+52
|\ \ \ \ \ \ \
| * | | | | | | submodule: fix relative url parsing for scp-style originThomas Rast2011-01-102-2/+52
| |/ / / / / /
* | | | | | | Merge branch 'rj/maint-difftool-cygwin-workaround' into maintJunio C Hamano2011-01-191-4/+8
|\ \ \ \ \ \ \
| * | | | | | | difftool: Fix failure on CygwinRamsay Jones2010-12-141-4/+8
* | | | | | | | Merge branch 'rj/maint-test-fixes' into maintJunio C Hamano2011-01-194-23/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | t9501-*.sh: Fix a test failure on CygwinRamsay Jones2010-12-141-1/+1
| * | | | | | | | lib-git-svn.sh: Add check for mis-configured web server variablesRamsay Jones2010-12-141-0/+10
| * | | | | | | | lib-git-svn.sh: Avoid setting web server variables unnecessarilyRamsay Jones2010-12-141-22/+25
| * | | | | | | | t9142: Move call to start_httpd into the setup testRamsay Jones2010-12-141-3/+2
| * | | | | | | | t3600-rm.sh: Don't pass a non-existent prereq to test #15Ramsay Jones2010-12-141-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'jn/maint-gitweb-pathinfo-fix' into maintJunio C Hamano2011-01-191-8/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: Fix handling of whitespace in generated linksJakub Narebski2010-12-141-8/+23
| |/ / / / / / /
* | | | | | | | Merge branch 'ak/describe-exact' into maintJunio C Hamano2011-01-191-25/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | describe: Delay looking up commits until searching for an inexact matchAnders Kaseorg2010-12-091-15/+22
| * | | | | | | | describe: Store commit_names in a hash table by commit SHA1Anders Kaseorg2010-12-091-5/+33
| * | | | | | | | describe: Do not use a flex array in struct commit_nameAnders Kaseorg2010-12-091-6/+6
| * | | | | | | | describe: Use for_each_rawrefAnders Kaseorg2010-12-091-1/+1
* | | | | | | | | Merge branch 'jn/maint-fast-import-object-reuse' into maintJunio C Hamano2011-01-191-7/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-import: insert new object entries at start of hash bucketDavid Barr2010-11-241-7/+2
* | | | | | | | | | Merge branch 'jn/submodule-b-current' into maintJunio C Hamano2011-01-192-20/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git submodule: Remove now obsolete tests before cloning a repoJens Lehmann2010-12-062-19/+23
| * | | | | | | | | | git submodule -b ... of current HEAD failsJonathan Nieder2010-12-061-1/+1
* | | | | | | | | | | Merge branch 'jc/maint-svn-info-test-fix' into maintJunio C Hamano2011-01-191-72/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t9119: do not compare "Text Last Updated" line from "svn info"Junio C Hamano2010-12-061-72/+34
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'nd/maint-relative' into maintJunio C Hamano2011-01-191-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | get_cwd_relative(): do not misinterpret root pathNguyễn Thái Ngọc Duy2010-11-231-0/+6
* | | | | | | | | | | | commit: suggest --amend --reset-author to fix commiter identityMatthieu Moy2011-01-121-2/+2
* | | | | | | | | | | | Merge branch 'maint-1.7.2' into maintJunio C Hamano2011-01-102-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2011-01-102-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2011-01-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | * | | | | | | | | Documentation/git-archive: spell --worktree-attributes correctlyThomas Rast2011-01-101-1/+1
| | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | * | | | | | | | | Documentation/githooks: post-rewrite-copy-notes never existedThomas Rast2011-01-101-4/+0