summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* dir.c: correct "stuck" logging logicnd/exclusion-regression-fixNguyễn Thái Ngọc Duy2016-03-182-3/+9
* dir.c: fix bug in 'nd/exclusion-regression-fix' topicNguyễn Thái Ngọc Duy2016-03-182-1/+20
* dir.c: don't exclude whole dir prematurelyNguyễn Thái Ngọc Duy2016-02-154-10/+276
* dir.c: support marking some patterns already matchedNguyễn Thái Ngọc Duy2016-02-152-3/+77
* dir.c: support tracing excludeNguyễn Thái Ngọc Duy2016-02-153-0/+26
* dir.c: fix match_pathname()Nguyễn Thái Ngọc Duy2016-02-151-1/+1
* Merge branch 'cc/untracked'Junio C Hamano2016-02-1012-56/+307
|\
| * 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
* | Merge branch 'js/xmerge-marker-eol'Junio C Hamano2016-02-102-18/+93
|\ \
| * | merge-file: ensure that conflict sections match eol stylejs/xmerge-marker-eolJohannes Schindelin2016-01-272-15/+25
| * | merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin2016-01-272-4/+69
* | | Merge branch 'nd/do-not-move-worktree-manually'Junio C Hamano2016-02-103-21/+14
|\ \ \
| * | | worktree: stop supporting moving worktrees manuallynd/do-not-move-worktree-manuallyNguyễn Thái Ngọc Duy2016-01-222-17/+10
| * | | worktree.c: fix indentationNguyễn Thái Ngọc Duy2016-01-191-4/+4
* | | | Sync with 2.7.1Junio C Hamano2016-02-052-1/+89
|\ \ \ \
| * | | | Git 2.7.1v2.7.1Junio C Hamano2016-02-054-3/+91
| * | | | Merge branch 'lv/add-doc-working-tree' into maintJunio C Hamano2016-02-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'ss/clone-depth-single-doc' into maintJunio C Hamano2016-02-052-9/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sg/t6050-failing-editor-test-fix' into maintJunio C Hamano2016-02-051-3/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ew/for-each-ref-doc' into maintJunio C Hamano2016-02-051-2/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ss/user-manual' into maintJunio C Hamano2016-02-052-10/+36
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/ref-cache-non-repository-optim' into maintJunio C Hamano2016-02-056-40/+80
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/dirname-basename' into maintJunio C Hamano2016-02-057-24/+225
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/complete-word-diff-regex' into maintJunio C Hamano2016-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-051-3/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/completion-show-branch' into maintJunio C Hamano2016-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/completion-rebase' into maintJunio C Hamano2016-02-051-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-057-12/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dw/subtree-split-do-not-drop-merge' into maintJunio C Hamano2016-02-052-2/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/svn-1.9.0-auth' into maintJunio C Hamano2016-02-051-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/list-tag-2.7-regression' into maintJunio C Hamano2016-02-057-56/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/sanity' into maintJunio C Hamano2016-02-051-5/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-no-index' into maintJunio C Hamano2016-02-052-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/close-packs-before-gc' into maintJunio C Hamano2016-02-055-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into maintJunio C Hamano2016-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ho/gitweb-squelch-undef-warning' into maintJunio C Hamano2016-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/fopen-harder' into maintJunio C Hamano2016-02-055-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/exclusion-regression-fix' into maintJunio C Hamano2016-02-053-118/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/reflog-walk-with-non-commit' into maintJunio C Hamano2016-02-052-5/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dw/signoff-doc' into maintJunio C Hamano2016-02-055-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status