Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/stash-pop-not-popped' | Junio C Hamano | 2014-03-21 | 1 | -2/+8 |
|\ | |||||
| * | stash pop: mention we did not drop the stash upon failing to applyjc/stash-pop-not-popped | Junio C Hamano | 2014-02-26 | 1 | -2/+8 |
* | | Merge branch 'dk/skip-prefix-scan-only-once' | Junio C Hamano | 2014-03-21 | 1 | -2/+5 |
|\ \ | |||||
| * | | skip_prefix(): scan prefix only oncedk/skip-prefix-scan-only-once | David Kastrup | 2014-03-03 | 1 | -2/+5 |
* | | | Merge branch 'nd/tag-version-sort' | Junio C Hamano | 2014-03-21 | 6 | -5/+211 |
|\ \ \ | |||||
| * | | | tag: support --sort=<spec>nd/tag-version-sort | Nguyễn Thái Ngọc Duy | 2014-02-27 | 6 | -5/+211 |
| |/ / | |||||
* | | | Merge branch 'jk/shallow-update-fix' | Junio C Hamano | 2014-03-21 | 5 | -56/+49 |
|\ \ \ | |||||
| * | | | shallow: verify shallow file after taking lockjk/shallow-update-fix | Jeff King | 2014-03-17 | 1 | -2/+2 |
| * | | | shallow: automatically clean up shallow tempfiles | Jeff King | 2014-02-27 | 5 | -37/+40 |
| * | | | shallow: use stat_validity to check for up-to-date file | Jeff King | 2014-02-27 | 1 | -17/+7 |
| |/ / | |||||
* | | | Merge branch 'tc/commit-dry-run-exit-status-tests' | Junio C Hamano | 2014-03-21 | 1 | -0/+36 |
|\ \ \ | |||||
| * | | | demonstrate git-commit --dry-run exit code behaviourtc/commit-dry-run-exit-status-tests | Tay Ray Chuan | 2014-02-24 | 1 | -0/+36 |
| |/ / | |||||
* | | | Sync with 1.9.1 | Junio C Hamano | 2014-03-18 | 2 | -1/+61 |
|\ \ \ | |||||
| * | | | Git 1.9.1v1.9.1 | Junio C Hamano | 2014-03-18 | 4 | -3/+63 |
| * | | | Merge branch 'jk/clean-d-pathspec' into maint | Junio C Hamano | 2014-03-18 | 2 | -11/+25 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'da/difftool-git-files' into maint | Junio C Hamano | 2014-03-18 | 2 | -16/+16 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/remote-pushremote-config-reading' into maint | Junio C Hamano | 2014-03-18 | 2 | -1/+19 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/commit-dates-parsing-fix' into maint | Junio C Hamano | 2014-03-18 | 6 | -11/+96 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint | Junio C Hamano | 2014-03-18 | 2 | -3/+32 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'nd/reset-setup-worktree' into maint | Junio C Hamano | 2014-03-18 | 2 | -3/+15 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/check-attr-honor-working-tree' into maint | Junio C Hamano | 2014-03-18 | 2 | -22/+43 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint | Junio C Hamano | 2014-03-18 | 4 | -14/+70 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ds/rev-parse-required-args' into maint | Junio C Hamano | 2014-03-18 | 1 | -6/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/config-path-include-fix' into maint | Junio C Hamano | 2014-03-18 | 2 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diff-quiet-stat-dirty' into maint | Junio C Hamano | 2014-03-18 | 3 | -24/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/http-fetch-shallow-fix' into maint | Junio C Hamano | 2014-03-18 | 12 | -37/+105 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint | Junio C Hamano | 2014-03-18 | 22 | -76/+89 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | Update draft release notes to Git 2.0 | Junio C Hamano | 2014-03-18 | 1 | -0/+11 |
* | | | | | | | | | | | | | | | | | Merge branch 'rs/grep-h-c' | Junio C Hamano | 2014-03-18 | 2 | -31/+46 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | grep: support -h (no header) with --countrs/grep-h-c | René Scharfe | 2014-03-11 | 2 | -2/+17 |
| * | | | | | | | | | | | | | | | | | t7810: add missing variables to tests in loop | René Scharfe | 2014-03-11 | 1 | -29/+29 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'rm/strchrnul-not-strlen' | Junio C Hamano | 2014-03-18 | 9 | -54/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | use strchrnul() in place of strchr() and strlen()rm/strchrnul-not-strlen | Rohit Mani | 2014-03-10 | 9 | -59/+34 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jc/tag-contains-with' | Junio C Hamano | 2014-03-18 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | tag: grok "--with" as synonym to "--contains"jc/tag-contains-with | Junio C Hamano | 2014-03-07 | 1 | -0/+6 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'bg/install-branch-config-skip-prefix' | Junio C Hamano | 2014-03-18 | 2 | -9/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | branch: use skip_prefix() in install_branch_config()bg/install-branch-config-skip-prefix | Brian Gesiak | 2014-03-06 | 1 | -9/+9 |
| * | | | | | | | | | | | | | | | | | t3200-branch: test setting branch as own upstream | Brian Gesiak | 2014-03-06 | 1 | -0/+10 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jc/no-need-for-env-in-sh-scripts' | Junio C Hamano | 2014-03-18 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | *.sh: drop useless use of "env"jc/no-need-for-env-in-sh-scripts | Junio C Hamano | 2014-03-06 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | | | | Merge branch 'sh/use-hashcpy' | Junio C Hamano | 2014-03-18 | 5 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Use hashcpy() when copying object namessh/use-hashcpy | Sun He | 2014-03-06 | 5 | -6/+6 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mh/simplify-cache-tree-find' | Junio C Hamano | 2014-03-18 | 1 | -10/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | cache_tree_find(): use path variable when passing over slashesmh/simplify-cache-tree-find | Michael Haggerty | 2014-03-05 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | | | | | cache_tree_find(): remove early return | Michael Haggerty | 2014-03-05 | 1 | -2/+0 |
| * | | | | | | | | | | | | | | | | | | | cache_tree_find(): remove redundant check | Michael Haggerty | 2014-03-05 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | cache_tree_find(): fix comment formatting | Michael Haggerty | 2014-03-05 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | | | | | cache_tree_find(): find the end of path component using strchrnul() | Michael Haggerty | 2014-03-05 | 1 | -3/+1 |
| * | | | | | | | | | | | | | | | | | | | cache_tree_find(): remove redundant checks | Michael Haggerty | 2014-03-05 | 1 | -4/+3 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jn/branch-lift-unnecessary-name-length-limit' | Junio C Hamano | 2014-03-18 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |