summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/stash-pop-not-popped'Junio C Hamano2014-03-211-2/+8
|\
| * stash pop: mention we did not drop the stash upon failing to applyjc/stash-pop-not-poppedJunio C Hamano2014-02-261-2/+8
* | Merge branch 'dk/skip-prefix-scan-only-once'Junio C Hamano2014-03-211-2/+5
|\ \
| * | skip_prefix(): scan prefix only oncedk/skip-prefix-scan-only-onceDavid Kastrup2014-03-031-2/+5
* | | Merge branch 'nd/tag-version-sort'Junio C Hamano2014-03-216-5/+211
|\ \ \
| * | | tag: support --sort=<spec>nd/tag-version-sortNguyễn Thái Ngọc Duy2014-02-276-5/+211
| |/ /
* | | Merge branch 'jk/shallow-update-fix'Junio C Hamano2014-03-215-56/+49
|\ \ \
| * | | shallow: verify shallow file after taking lockjk/shallow-update-fixJeff King2014-03-171-2/+2
| * | | shallow: automatically clean up shallow tempfilesJeff King2014-02-275-37/+40
| * | | shallow: use stat_validity to check for up-to-date fileJeff King2014-02-271-17/+7
| |/ /
* | | Merge branch 'tc/commit-dry-run-exit-status-tests'Junio C Hamano2014-03-211-0/+36
|\ \ \
| * | | demonstrate git-commit --dry-run exit code behaviourtc/commit-dry-run-exit-status-testsTay Ray Chuan2014-02-241-0/+36
| |/ /
* | | Sync with 1.9.1Junio C Hamano2014-03-182-1/+61
|\ \ \
| * | | Git 1.9.1v1.9.1Junio C Hamano2014-03-184-3/+63
| * | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-182-11/+25
| |\ \ \
| * \ \ \ Merge branch 'da/difftool-git-files' into maintJunio C Hamano2014-03-182-16/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/remote-pushremote-config-reading' into maintJunio C Hamano2014-03-182-1/+19
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-03-186-11/+96
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2014-03-182-3/+32
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-182-3/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-182-22/+43
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-184-14/+70
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ds/rev-parse-required-args' into maintJunio C Hamano2014-03-181-6/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-path-include-fix' into maintJunio C Hamano2014-03-182-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano2014-03-183-24/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/http-fetch-shallow-fix' into maintJunio C Hamano2014-03-1812-37/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-1822-76/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Update draft release notes to Git 2.0Junio C Hamano2014-03-181-0/+11
* | | | | | | | | | | | | | | | | Merge branch 'rs/grep-h-c'Junio C Hamano2014-03-182-31/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | grep: support -h (no header) with --countrs/grep-h-cRené Scharfe2014-03-112-2/+17
| * | | | | | | | | | | | | | | | | t7810: add missing variables to tests in loopRené Scharfe2014-03-111-29/+29
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rm/strchrnul-not-strlen'Junio C Hamano2014-03-189-54/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | use strchrnul() in place of strchr() and strlen()rm/strchrnul-not-strlenRohit Mani2014-03-109-59/+34
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jc/tag-contains-with'Junio C Hamano2014-03-181-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | tag: grok "--with" as synonym to "--contains"jc/tag-contains-withJunio C Hamano2014-03-071-0/+6
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'bg/install-branch-config-skip-prefix'Junio C Hamano2014-03-182-9/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | branch: use skip_prefix() in install_branch_config()bg/install-branch-config-skip-prefixBrian Gesiak2014-03-061-9/+9
| * | | | | | | | | | | | | | | | | t3200-branch: test setting branch as own upstreamBrian Gesiak2014-03-061-0/+10
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jc/no-need-for-env-in-sh-scripts'Junio C Hamano2014-03-182-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | *.sh: drop useless use of "env"jc/no-need-for-env-in-sh-scriptsJunio C Hamano2014-03-062-2/+2
* | | | | | | | | | | | | | | | | | Merge branch 'sh/use-hashcpy'Junio C Hamano2014-03-185-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Use hashcpy() when copying object namessh/use-hashcpySun He2014-03-065-6/+6
* | | | | | | | | | | | | | | | | | | Merge branch 'mh/simplify-cache-tree-find'Junio C Hamano2014-03-181-10/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | cache_tree_find(): use path variable when passing over slashesmh/simplify-cache-tree-findMichael Haggerty2014-03-051-2/+3
| * | | | | | | | | | | | | | | | | | | cache_tree_find(): remove early returnMichael Haggerty2014-03-051-2/+0
| * | | | | | | | | | | | | | | | | | | cache_tree_find(): remove redundant checkMichael Haggerty2014-03-051-1/+1
| * | | | | | | | | | | | | | | | | | | cache_tree_find(): fix comment formattingMichael Haggerty2014-03-051-2/+3
| * | | | | | | | | | | | | | | | | | | cache_tree_find(): find the end of path component using strchrnul()Michael Haggerty2014-03-051-3/+1
| * | | | | | | | | | | | | | | | | | | cache_tree_find(): remove redundant checksMichael Haggerty2014-03-051-4/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/branch-lift-unnecessary-name-length-limit'Junio C Hamano2014-03-181-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \