summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* worktree add -B: do the checkout test before update branchnd/worktree-add-BNguyễn Thái Ngọc Duy2016-02-152-1/+17
* worktree: fix "add -B"Nguyễn Thái Ngọc Duy2016-02-152-3/+9
* Sixth batch for the 2.8 cycleJunio C Hamano2016-02-101-0/+40
* Merge branch 'js/test-lib-windows-emulated-yes'Junio C Hamano2016-02-101-2/+4
|\
| * test-lib: limit the output of the yes utilityjs/test-lib-windows-emulated-yesJohannes Schindelin2016-02-021-2/+4
* | Merge branch 'wp/sha1-name-negative-match'Junio C Hamano2016-02-103-11/+73
|\ \
| * | object name: introduce '^{/!-<negative pattern>}' notationwp/sha1-name-negative-matchWill Palmer2016-02-013-11/+51
| * | test for '!' handling in rev-parse's named commitsWill Palmer2016-01-111-1/+23
* | | Merge branch 'jk/options-cleanup'Junio C Hamano2016-02-107-102/+57
|\ \ \
| * | | apply, ls-files: simplify "-z" parsingjk/options-cleanupJeff King2016-02-012-24/+6
| * | | checkout-index: disallow "--no-stage" optionJeff King2016-02-011-3/+3
| * | | checkout-index: handle "--no-index" optionJeff King2016-02-011-24/+10
| * | | checkout-index: handle "--no-prefix" optionJeff King2016-02-011-12/+6
| * | | checkout-index: simplify "-z" option parsingJeff King2016-02-011-10/+2
| * | | give "nbuf" strbuf a more meaningful nameJeff King2016-02-015-29/+30
* | | | Merge branch 'aw/push-force-with-lease-reporting'Junio C Hamano2016-02-102-12/+18
|\ \ \ \
| * | | | push: fix ref status reporting for --force-with-leaseaw/push-force-with-lease-reportingAndrew Wheeler2016-02-012-12/+18
* | | | | Merge branch 'ls/clean-smudge-override-in-config'Junio C Hamano2016-02-102-1/+17
|\ \ \ \ \
| * | | | | convert: treat an empty string for clean/smudge filters as "cat"ls/clean-smudge-override-in-configLars Schneider2016-01-292-1/+17
| |/ / / /
* | | | | Merge branch 'ew/connect-verbose'Junio C Hamano2016-02-101-5/+6
|\ \ \ \ \
| * | | | | pass transport verbosity down to git_connectEric Wong2016-01-281-5/+6
| |/ / / /
* | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \