summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config: flip return value of write_section()rs/config-write-section-fixRené Scharfe2017-11-181-1/+1
* Merge branch 'sd/branch-copy'Junio C Hamano2017-10-0310-48/+478
|\
| * branch: fix "copy" to never touch HEADJunio C Hamano2017-09-242-11/+8
| * branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-189-46/+424
| * branch: add test for -m renaming multiple config sectionsÆvar Arnfjörð Bjarmason2017-06-181-0/+41
| * config: create a function to format section headersSahil Dua2017-06-181-2/+11
* | Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano2017-10-036-10/+139
|\ \
| * | parse-options: only insert newline in help text if neededbc/rev-parse-parseopt-fixBrandon Casey2017-09-252-4/+10
| * | parse-options: write blank line to correct output streamBrandon Casey2017-09-253-5/+5
| * | t0040,t1502: Demonstrate parse_options bugsBrandon Casey2017-09-253-3/+107
| * | git-rebase: don't ignore unexpected command line argumentsBrandon Casey2017-09-191-0/+3
| * | rev-parse parseopt: interpret any whitespace as start of help textBrandon Casey2017-09-192-3/+11
| * | rev-parse parseopt: do not search help text for flag charsBrandon Casey2017-09-192-4/+6
| * | t1502: demonstrate rev-parse --parseopt option mis-parsingBrandon Casey2017-09-191-6/+12
* | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-037-360/+647
|\ \ \
| * | | rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-276-98/+213
| * | | t3415: test fixup with wrapped onelineJohannes Schindelin2017-07-271-0/+14
| * | | rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin2017-07-274-39/+116
| * | | rebase -i: check for missing commits in the rebase--helperJohannes Schindelin2017-07-274-160/+134
| * | | t3404: relax rebase.missingCommitsCheck testsJohannes Schindelin2017-07-271-18/+4
| * | | rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin2017-07-274-26/+70
| * | | rebase -i: do not invent onelines when expanding/collapsing SHA-1sJohannes Schindelin2017-07-271-1/+6
| * | | rebase -i: remove useless indentationJohannes Schindelin2017-07-271-7/+7
| * | | rebase -i: generate the script via rebase--helperJohannes Schindelin2017-07-274-22/+82
| * | | t3415: verify that an empty instructionFormat is handled as beforeJohannes Schindelin2017-07-271-0/+12
* | | | The eleventh batch for 2.15Junio C Hamano2017-09-291-0/+18
* | | | Merge branch 'sb/doc-config-submodule-update'Junio C Hamano2017-09-291-4/+8
|\ \ \ \
| * | | | Documentation/config: clarify the meaning of submodule.<name>.updatesb/doc-config-submodule-updateStefan Beller2017-09-241-4/+8
* | | | | Merge branch 'ma/leakplugs'Junio C Hamano2017-09-2917-35/+75
|\ \ \ \ \
| * | | | | pack-bitmap[-write]: use `object_array_clear()`, don't leakma/leakplugsMartin Ågren2017-09-242-10/+4
| * | | | | object_array: add and use `object_array_pop()`Martin Ågren2017-09-246-10/+25
| * | | | | object_array: use `object_array_clear()`, not `free()`Martin Ågren2017-09-244-7/+6
| * | | | | leak_pending: use `object_array_clear()`, not `free()`Martin Ågren2017-09-244-3/+29
| * | | | | commit: fix memory leak in `reduce_heads()`Martin Ågren2017-09-241-0/+1
| * | | | | builtin/commit: fix memory leak in `prepare_index()`Martin Ågren2017-09-241-5/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'rj/no-sign-compare'Junio C Hamano2017-09-2910-24/+25
|\ \ \ \ \
| * | | | | ALLOC_GROW: avoid -Wsign-compare warningsrj/no-sign-compareRamsay Jones2017-09-227-17/+16
| * | | | | cache.h: hex2chr() - avoid -Wsign-compare warningsRamsay Jones2017-09-221-2/+2
| * | | | | commit-slab.h: avoid -Wsign-compare warningsRamsay Jones2017-09-221-3/+3
| * | | | | git-compat-util.h: xsize_t() - avoid -Wsign-compare warningsRamsay Jones2017-09-221-2/+4
| |/ / / /
* | | | | Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano2017-09-291-5/+4
|\ \ \ \ \
| * | | | | Documentation/githooks: mention merge in commit-msg hooksb/merge-commit-msg-hookStefan Beller2017-09-221-5/+4
* | | | | | Merge branch 'jt/fast-export-copy-modify-fix'Junio C Hamano2017-09-292-15/+51
|\ \ \ \ \ \
| * | | | | | fast-export: do not copy from modified filejt/fast-export-copy-modify-fixJonathan Tan2017-09-212-15/+51
* | | | | | | Merge branch 'mk/describe-match-with-all'Junio C Hamano2017-09-293-22/+58
|\ \ \ \ \ \ \
| * | | | | | | describe: teach --match to handle branches and remotesmk/describe-match-with-allMax Kirillov2017-09-203-22/+58
| * | | | | | | Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-allJunio C Hamano2017-09-202-4/+11
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jm/status-ignored-directory-optim'Junio C Hamano2017-09-291-6/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve performance of git status --ignoredjm/status-ignored-directory-optimJameson Miller2017-09-191-6/+41
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | The tenth batch for 2.15Junio C Hamano2017-09-281-0/+47
View Lorry Controller Status