summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* git-rebase--interactive.sh: Remove superfluous tab in rebase fileHEADmasterDaniel Baumann2018-07-251-1/+1
* Third batch for 2.19 cycleJunio C Hamano2018-07-181-1/+59
* Merge branch 'js/enhanced-version-info'Junio C Hamano2018-07-181-2/+3
|\
| * Makefile: fix the "built from commit" codeJohannes Schindelin2018-06-291-2/+3
* | Merge branch 'sb/mailmap'Junio C Hamano2018-07-181-1/+10
|\ \
| * | .mailmap: merge different spellings of namesStefan Beller2018-06-291-1/+10
* | | Merge branch 'ms/core-icase-doc'Junio C Hamano2018-07-181-3/+6
|\ \ \
| * | | Documentation: declare "core.ignoreCase" as internal variableMarc Strapetz2018-06-281-3/+6
* | | | Merge branch 'ds/commit-graph'Junio C Hamano2018-07-181-5/+5
|\ \ \ \
| * | | | commit-graph: fix documentation inconsistenciesDerrick Stolee2018-06-281-5/+5
* | | | | Merge branch 'tz/exclude-doc-smallfixes'Junio C Hamano2018-07-182-2/+2
|\ \ \ \ \
| * | | | | dir.c: fix typos in core.excludesfile commentTodd Zullinger2018-06-271-1/+1
| * | | | | gitignore.txt: clarify default core.excludesfile pathTodd Zullinger2018-06-271-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-07-181-1/+1
|\ \ \ \ \
| * | | | | rebase: fix documentation formattingVladimir Parfinenko2018-06-271-1/+1
* | | | | | Merge branch 'en/rebase-i-microfixes'Junio C Hamano2018-07-184-4/+41
|\ \ \ \ \ \
| * | | | | | git-rebase--merge: modernize "git-$cmd" to "git $cmd"Elijah Newren2018-06-271-2/+2
| * | | | | | Fix use of strategy options with interactive rebasesElijah Newren2018-06-273-3/+8
| * | | | | | t3418: add testcase showing problems with rebase -i and strategy optionsElijah Newren2018-06-271-0/+32
* | | | | | | Merge branch 'mb/filter-branch-optim'Junio C Hamano2018-07-182-0/+16
|\ \ \ \ \ \ \
| * | | | | | | filter-branch: skip commits present on --state-branchMichael Barabanov2018-06-262-0/+16
| |/ / / / / /
* | | | | | | Merge branch 'dj/runtime-prefix'Junio C Hamano2018-07-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Makefile: tweak sed invocationAlejandro R. Sedeño2018-06-261-1/+1
* | | | | | | | Merge branch 'ao/config-from-gitmodules'Junio C Hamano2018-07-186-57/+80
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule-config: reuse config_from_gitmodules in repo_read_gitmodulesAntonio Ospite2018-06-261-29/+21
| * | | | | | | | submodule-config: pass repository as argument to config_from_gitmodulesAntonio Ospite2018-06-261-5/+5
| * | | | | | | | submodule-config: make 'config_from_gitmodules' privateAntonio Ospite2018-06-262-11/+9
| * | | | | | | | submodule-config: add helper to get 'update-clone' config from .gitmodulesAntonio Ospite2018-06-263-4/+19
| * | | | | | | | submodule-config: add helper function to get 'fetch' config from .gitmodulesAntonio Ospite2018-06-263-14/+31
| * | | | | | | | config: move config_from_gitmodules to submodule-config.cAntonio Ospite2018-06-264-27/+28
* | | | | | | | | Merge branch 'jk/branch-l-0-deprecation'Junio C Hamano2018-07-184-21/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch: deprecate "-l" optionJeff King2018-06-222-2/+23
| * | | | | | | | | t: switch "branch -l" to "branch --create-reflog"Jeff King2018-06-222-19/+19
| * | | | | | | | | t3200: unset core.logallrefupdates when testing reflog creationJeff King2018-06-221-1/+1
* | | | | | | | | | Merge branch 'tb/grep-column'Junio C Hamano2018-07-188-34/+226
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | contrib/git-jump/git-jump: jump to exact locationTaylor Blau2018-06-222-3/+11
| * | | | | | | | | | grep.c: add configuration variables to show matched optionTaylor Blau2018-06-223-0/+14
| * | | | | | | | | | builtin/grep.c: add '--column' option to 'git-grep(1)'Taylor Blau2018-06-223-1/+101
| * | | | | | | | | | grep.c: display column number of first matchTaylor Blau2018-06-221-5/+28
| * | | | | | | | | | grep.[ch]: extend grep_opt to allow showing matched columnTaylor Blau2018-06-222-10/+39
| * | | | | | | | | | grep.c: expose {,inverted} match column in match_line()Taylor Blau2018-06-221-19/+39
| * | | | | | | | | | Documentation/config.txt: camel-case lineNumber for consistencyTaylor Blau2018-06-211-1/+1
* | | | | | | | | | | Merge branch 'vs/typofixes'Junio C Hamano2018-07-1813-15/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: spelling and grammar fixesVille Skyttä2018-06-2213-15/+15
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'bw/protocol-v2'Junio C Hamano2018-07-181-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | protocol-v2 doc: put HTTP headers after requestJosh Steadmon2018-06-221-2/+1
* | | | | | | | | | | | Merge branch 'jt/remove-pack-bitmap-global'Junio C Hamano2018-07-185-160/+234
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-bitmap: add free functionJonathan Tan2018-06-215-6/+37
| * | | | | | | | | | | | pack-bitmap: remove bitmap_git global variableJonathan Tan2018-06-215-158/+201
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bw/config-refer-to-gitsubmodules-doc'Junio C Hamano2018-07-181-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \