summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* status --short --inprogress: spell it as --in-progressmg/status-in-progress-infoJunio C Hamano2017-05-106-25/+24
* status: show in-progress info for short statusMichael J Gruber2017-04-146-8/+105
* Eleventh batch for 2.13Junio C Hamano2017-04-111-0/+14
* Merge branch 'ls/travis-relays-for-windows-ci'Junio C Hamano2017-04-112-0/+85
|\
| * travis-ci: build and test Git on WindowsLars Schneider2017-03-282-0/+85
* | Merge branch 'cc/untracked'Junio C Hamano2017-04-111-1/+5
|\ \
| * | update-index: fix xgetcwd() related memory leakcc/untrackedChristian Couder2017-03-301-1/+5
* | | Merge branch 'ah/log-decorate-default-to-auto'Junio C Hamano2017-04-112-2/+17
|\ \ \
| * | | log: if --decorate is not given, default to --decorate=autoAlex Henrie2017-03-242-2/+17
* | | | Merge branch 'ab/ref-filter-no-contains'Junio C Hamano2017-04-1114-72/+440
|\ \ \ \
| * | | | tag: add tests for --with and --withoutÆvar Arnfjörð Bjarmason2017-03-241-2/+4
| * | | | ref-filter: reflow recently changed branch/tag/for-each-ref docsÆvar Arnfjörð Bjarmason2017-03-242-10/+12
| * | | | ref-filter: add --no-contains option to tag/branch/for-each-refÆvar Arnfjörð Bjarmason2017-03-2413-25/+245
| * | | | tag: change --point-at to default to HEADÆvar Arnfjörð Bjarmason2017-03-243-3/+12
| * | | | tag: implicitly supply --list given another list-like optionÆvar Arnfjörð Bjarmason2017-03-243-17/+73
| * | | | tag: change misleading --list <pattern> documentationÆvar Arnfjörð Bjarmason2017-03-242-7/+33
| * | | | parse-options: add OPT_NONEG to the "contains" optionÆvar Arnfjörð Bjarmason2017-03-241-2/+2
| * | | | tag: add more incompatibles mode testsÆvar Arnfjörð Bjarmason2017-03-241-0/+16
| * | | | for-each-ref: partly change <object> to <commit> in helpÆvar Arnfjörð Bjarmason2017-03-231-2/+2
| * | | | tag tests: fix a typo in a test descriptionÆvar Arnfjörð Bjarmason2017-03-231-1/+1
| * | | | tag: remove a TODO item from the test suiteÆvar Arnfjörð Bjarmason2017-03-231-2/+0
| * | | | ref-filter: add test for --contains on a non-commitÆvar Arnfjörð Bjarmason2017-03-232-1/+12
| * | | | ref-filter: make combining --merged & --no-merged an errorÆvar Arnfjörð Bjarmason2017-03-217-7/+32
| * | | | tag doc: reword --[no-]merged to talk about commits, not tipsÆvar Arnfjörð Bjarmason2017-03-211-3/+3
| * | | | tag doc: split up the --[no-]merged documentationÆvar Arnfjörð Bjarmason2017-03-211-4/+7
| * | | | tag doc: move the description of --[no-]merged earlierÆvar Arnfjörð Bjarmason2017-03-211-5/+5
* | | | | Tenth batch for 2.13Junio C Hamano2017-03-301-2/+64
* | | | | Merge branch 'jk/make-coccicheck-detect-errors'Junio C Hamano2017-03-301-2/+10
|\ \ \ \ \
| * | | | | Makefile: detect errors in running spatchjk/make-coccicheck-detect-errorsJeff King2017-03-291-2/+10
* | | | | | Merge branch 'bc/push-cert-receive-fix'Junio C Hamano2017-03-301-1/+1
|\ \ \ \ \ \
| * | | | | | builtin/receive-pack: fix incorrect pointer arithmeticbc/push-cert-receive-fixbrian m. carlson2017-03-281-1/+1
* | | | | | | Merge branch 'mh/notes-tree-consolidate-fix'Junio C Hamano2017-03-301-2/+4
|\ \ \ \ \ \ \
| * | | | | | | notes: do not break note_tree structure in note_tree_consolidate()mh/notes-tree-consolidate-fixMike Hommey2017-03-271-2/+4
* | | | | | | | Merge branch 'js/rebase-i-reword-to-run-hooks'Junio C Hamano2017-03-302-23/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | sequencer: allow the commit-msg hooks to run during a `reword`js/rebase-i-reword-to-run-hooksJohannes Schindelin2017-03-272-3/+7
| * | | | | | | | sequencer: make commit options more extensibleJohannes Schindelin2017-03-271-22/+26
| * | | | | | | | t7504: document regression: reword no longer calls commit-msgJohannes Schindelin2017-03-221-0/+17
* | | | | | | | | Merge branch 'mg/describe-debug-l10n'Junio C Hamano2017-03-302-4/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | l10n: de: translate describe debug termsmg/describe-debug-l10nMichael J Gruber2017-03-271-1/+13
| * | | | | | | | | describe: localize debug output fullyMichael J Gruber2017-03-271-3/+12
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/case-insensitive-upstream-and-push-marker'Junio C Hamano2017-03-304-8/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rev-parse: match @{upstream}, @{u} and @{push} case-insensitivelyab/case-insensitive-upstream-and-push-markerÆvar Arnfjörð Bjarmason2017-03-274-8/+23
* | | | | | | | | | Merge branch 'ab/doc-submitting'Junio C Hamano2017-03-301-3/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc/SubmittingPatches: show how to get a CLI commit summaryab/doc-submittingÆvar Arnfjörð Bjarmason2017-03-261-1/+2
| * | | | | | | | | | doc/SubmittingPatches: clarify the casing convention for "area: change..."Ævar Arnfjörð Bjarmason2017-03-211-2/+7
* | | | | | | | | | | Merge branch 'ab/test-readme-updates'Junio C Hamano2017-03-301-5/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t/README: clarify the test_have_prereq documentationab/test-readme-updatesÆvar Arnfjörð Bjarmason2017-03-261-3/+5
| * | | | | | | | | | | t/README: change "Inside <X> part" to "Inside the <X> part"Ævar Arnfjörð Bjarmason2017-03-221-1/+1
| * | | | | | | | | | | t/README: link to metacpan.org, not search.cpan.orgÆvar Arnfjörð Bjarmason2017-03-221-1/+1
* | | | | | | | | | | | Merge branch 'rs/freebsd-getcwd-workaround'Junio C Hamano2017-03-302-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \