aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | test for '!' handling in rev-parse's named commitsWill Palmer2016-01-11
* | | | | | | | | | | | | | | | Merge branch 'jk/options-cleanup'Junio C Hamano2016-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | apply, ls-files: simplify "-z" parsingJeff King2016-02-01
| * | | | | | | | | | | | | | | | checkout-index: disallow "--no-stage" optionJeff King2016-02-01
| * | | | | | | | | | | | | | | | checkout-index: handle "--no-index" optionJeff King2016-02-01
| * | | | | | | | | | | | | | | | checkout-index: handle "--no-prefix" optionJeff King2016-02-01
| * | | | | | | | | | | | | | | | checkout-index: simplify "-z" option parsingJeff King2016-02-01
| * | | | | | | | | | | | | | | | give "nbuf" strbuf a more meaningful nameJeff King2016-02-01
* | | | | | | | | | | | | | | | | Merge branch 'aw/push-force-with-lease-reporting'Junio C Hamano2016-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | push: fix ref status reporting for --force-with-leaseAndrew Wheeler2016-02-01
* | | | | | | | | | | | | | | | | Merge branch 'ls/clean-smudge-override-in-config'Junio C Hamano2016-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | convert: treat an empty string for clean/smudge filters as "cat"Lars Schneider2016-01-29
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ew/connect-verbose'Junio C Hamano2016-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | pass transport verbosity down to git_connectEric Wong2016-01-28
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'cc/untracked'Junio C Hamano2016-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t7063: add tests for core.untrackedCacheChristian Couder2016-01-27
| * | | | | | | | | | | | | | | | test-dump-untracked-cache: don't modify the untracked cacheChristian Couder2016-01-27
| * | | | | | | | | | | | | | | | config: add core.untrackedCacheChristian Couder2016-01-27
| * | | | | | | | | | | | | | | | dir: simplify untracked cache "ident" fieldChristian Couder2016-01-25
| * | | | | | | | | | | | | | | | dir: add remove_untracked_cache()Christian Couder2016-01-25
| * | | | | | | | | | | | | | | | dir: add {new,add}_untracked_cache()Christian Couder2016-01-25
| * | | | | | | | | | | | | | | | update-index: move 'uc' var declarationChristian Couder2016-01-25
| * | | | | | | | | | | | | | | | update-index: add untracked cache notificationsChristian Couder2016-01-25
| * | | | | | | | | | | | | | | | update-index: add --test-untracked-cacheChristian Couder2016-01-25
| * | | | | | | | | | | | | | | | update-index: use enum for untracked cache optionsChristian Couder2016-01-25
| * | | | | | | | | | | | | | | | dir: free untracked cache when removing itChristian Couder2015-12-29
* | | | | | | | | | | | | | | | | Merge branch 'js/xmerge-marker-eol'Junio C Hamano2016-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | merge-file: ensure that conflict sections match eol styleJohannes Schindelin2016-01-27
| * | | | | | | | | | | | | | | | merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin2016-01-27
* | | | | | | | | | | | | | | | | Merge branch 'nd/do-not-move-worktree-manually'Junio C Hamano2016-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | worktree: stop supporting moving worktrees manuallyNguyễn Thái Ngọc Duy2016-01-22
| * | | | | | | | | | | | | | | | worktree.c: fix indentationNguyễn Thái Ngọc Duy2016-01-19
* | | | | | | | | | | | | | | | | Sync with 2.7.1Junio C Hamano2016-02-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Git 2.7.1v2.7.1Junio C Hamano2016-02-05
| * | | | | | | | | | | | | | | | Merge branch 'lv/add-doc-working-tree' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/clone-depth-single-doc' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/t6050-failing-editor-test-fix' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/for-each-ref-doc' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/user-manual' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ref-cache-non-repository-optim' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/dirname-basename' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/complete-word-diff-regex' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/completion-show-branch' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/completion-rebase' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dw/subtree-split-do-not-drop-merge' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/svn-1.9.0-auth' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/list-tag-2.7-regression' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/sanity' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \