summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-wordsJeff King2014-06-042-0/+7
* parse-options: make sure argh string does not have SP or _Junio C Hamano2014-03-241-0/+3
* update-index: teach --cacheinfo a new syntax "mode,sha1,path"Junio C Hamano2014-03-243-5/+50
* parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-2413-24/+24
* t1502: protect runs of SPs used in the indentationJunio C Hamano2014-03-231-56/+56
* rev-parse --parseopt: option argument name hintsIlya Bobyr2014-03-233-3/+64
* Update draft release notes to 2.0Junio C Hamano2014-03-211-2/+26
* Merge branch 'lt/request-pull'Junio C Hamano2014-03-213-83/+126
|\
| * request-pull: documentation updatesJunio C Hamano2014-03-131-6/+49
| * request-pull: resurrect "pretty refname" featureJunio C Hamano2014-02-252-2/+10
| * request-pull: test updatesJunio C Hamano2014-02-251-8/+8
| * request-pull: pick up tag message as beforeJunio C Hamano2014-02-251-0/+8
| * request-pull: allow "local:remote" to specify names on both endsLinus Torvalds2014-02-251-21/+29
| * request-pull: more strictly match local/remote branchesLinus Torvalds2014-02-251-67/+43
* | Merge branch 'es/sh-i18n-envsubst'Junio C Hamano2014-03-211-12/+0
|\ \
| * | sh-i18n--envsubst: retire unused string_list_member()es/sh-i18n-envsubstEric Sunshine2014-03-121-12/+0
* | | Merge branch 'nd/upload-pack-shallow'Junio C Hamano2014-03-214-3/+65
|\ \ \
| * | | upload-pack: send shallow info over stdin to pack-objectsnd/upload-pack-shallowNguyễn Thái Ngọc Duy2014-03-114-9/+37
* | | | Merge branch 'jn/wt-status'Junio C Hamano2014-03-213-55/+88
|\ \ \ \
| * | | | wt-status: lift the artificual "at least 20 columns" floorjn/wt-statusJunio C Hamano2014-03-123-15/+13
| * | | | wt-status: i18n of section labelsJonathan Nieder2014-03-121-19/+47
| * | | | wt-status: extract the code to compute width for labelsJonathan Nieder2014-03-121-7/+15
| * | | | wt-status: make full label string to be subject to l10nJunio C Hamano2014-03-121-18/+17
* | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |