aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-no-index' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/close-packs-before-gc' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ho/gitweb-squelch-undef-warning' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/fopen-harder' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/exclusion-regression-fix' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/reflog-walk-with-non-commit' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dw/signoff-doc' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/clang-pedantic' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/send-email-mutt-alias-fix' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/dir-exclude-cleanup' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/stop-setenv-work-tree' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fifth batch for 2.8 cycleJunio C Hamano2016-02-03
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kf/http-proxy-auth-methods'Junio C Hamano2016-02-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-04 17:54:45 +0000