summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update-index: fix xgetcwd() related memory leakcc/untrackedChristian Couder2017-03-301-1/+5
* t7063: add tests for core.untrackedCacheChristian Couder2016-01-271-4/+81
* test-dump-untracked-cache: don't modify the untracked cacheChristian Couder2016-01-274-0/+22
* config: add core.untrackedCacheChristian Couder2016-01-278-31/+133
* dir: simplify untracked cache "ident" fieldChristian Couder2016-01-252-16/+24
* dir: add remove_untracked_cache()Christian Couder2016-01-253-5/+11
* dir: add {new,add}_untracked_cache()Christian Couder2016-01-253-10/+20
* update-index: move 'uc' var declarationChristian Couder2016-01-251-3/+1
* update-index: add untracked cache notificationsChristian Couder2016-01-251-5/+9
* update-index: add --test-untracked-cacheChristian Couder2016-01-252-1/+16
* update-index: use enum for untracked cache optionsChristian Couder2016-01-251-5/+13
* dir: free untracked cache when removing itChristian Couder2015-12-291-0/+1
* Git 2.7-rc1v2.7.0-rc1Junio C Hamano2015-12-152-8/+14
* Sync with maintJunio C Hamano2015-12-151-0/+14
|\
| * Update draft release notes to 2.6.5Junio C Hamano2015-12-151-0/+14
| * Merge branch 'dt/fsck-verify-pack-error' into maintJunio C Hamano2015-12-151-1/+1
| |\
| * \ Merge branch 'ep/ident-with-getaddrinfo' into maintJunio C Hamano2015-12-151-4/+27
| |\ \
| * \ \ Merge branch 'ls/p4-keep-empty-commits' into maintJunio C Hamano2015-12-153-17/+165
| |\ \ \
| * \ \ \ Merge branch 'jk/prune-mtime' into maintJunio C Hamano2015-12-151-2/+2
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/send-email-complete-aliases'Junio C Hamano2015-12-151-1/+1
|\ \ \ \ \ \
| * | | | | | completion: fix completing unstuck email alias argumentsjk/send-email-complete-aliasesSZEDER Gábor2015-12-141-1/+1
* | | | | | | Merge branch 'ep/ident-with-getaddrinfo'Junio C Hamano2015-12-151-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | ident: fix undefined variable when NO_IPV6 is setep/ident-with-getaddrinfoJeff King2015-12-141-1/+1
* | | | | | | Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-153-17/+165
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | git-p4: add option to keep empty commitsls/p4-keep-empty-commitsLars Schneider2015-12-103-17/+165
* | | | | | | Merge branch 'jk/prune-mtime'Junio C Hamano2015-12-151-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | prune: close directory earlier during loose-object directory traversaljk/prune-mtimeJohannes Sixt2015-08-121-2/+2
* | | | | | | Update release notes to 2.7Junio C Hamano2015-12-111-65/+1
* | | | | | | Merge branch 'maint'Junio C Hamano2015-12-111-0/+25
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Prepare for 2.6.5Junio C Hamano2015-12-112-1/+26
| * | | | | | Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maintJunio C Hamano2015-12-111-1/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-114-5/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-111-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/doc-submodule-sync-recursive' into maintJunio C Hamano2015-12-111-1/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nd/doc-check-ref-format-typo' into maintJunio C Hamano2015-12-111-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/show-branch-argv-array' into maintJunio C Hamano2015-12-111-16/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/pop-commit' into maintJunio C Hamano2015-12-1110-92/+31
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/subtree-with-spaces' into maintJunio C Hamano2015-12-112-74/+124
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-114-16/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting'Junio C Hamano2015-12-111-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | revision.c: fix possible null pointer arithmeticsn/null-pointer-arith-in-mark-tree-uninterestingStefan Naewe2015-12-071-1/+3
* | | | | | | | | | | | | | | | Merge branch 'sb/doc-submodule-sync-recursive'Junio C Hamano2015-12-111-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | document submodule sync --recursivesb/doc-submodule-sync-recursiveStefan Beller2015-12-041-1/+4
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'cb/t3404-shellquote'Junio C Hamano2015-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquoteCharles Bailey2015-12-041-1/+1
* | | | | | | | | | | | | | | Merge branch 'sg/lock-file-commit-error'Junio C Hamano2015-12-114-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make error message after failing commit_lock_file() less confusingSZEDER Gábor2015-12-014-5/+8
* | | | | | | | | | | | | | | Git 2.7-rc0v2.7.0-rc0Junio C Hamano2015-12-101-1/+1
* | | | | | | | | | | | | | | Sync with maintJunio C Hamano2015-12-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Documentation/git-update-index: add missing opts to synopsisChristian Couder2015-12-101-0/+1