summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-04-25Merge branch 'jk/relative-directory-fix'Libravatar Junio C Hamano11-17/+223
2018-04-25Merge branch 'jk/flockfile-stdio'Libravatar Junio C Hamano1-3/+5
2018-04-25Merge branch 'pw/rebase-signoff'Libravatar Junio C Hamano8-57/+114
2018-04-25Merge branch 'pw/rebase-keep-empty-fixes'Libravatar Junio C Hamano3-3/+11
2018-04-25Merge branch 'cb/git-gui-ttk-style'Libravatar Junio C Hamano1-5/+10
2018-04-25Merge branch 'bp/git-gui-bind-kp-enter'Libravatar Junio C Hamano1-0/+1
2018-04-25Merge branch 'bb/git-gui-ssh-key-files'Libravatar Junio C Hamano1-1/+4
2018-04-25Make running git under other debugger-like programs easyLibravatar Elijah Newren2-10/+33
2018-04-24fetch: send server options when using protocol v2Libravatar Brandon Williams6-0/+38
2018-04-24ls-remote: send server options when using protocol v2Libravatar Brandon Williams7-3/+46
2018-04-24serve: introduce the server-option capabilityLibravatar Brandon Williams3-0/+32
2018-04-24Merge branch 'bw/protocol-v2' into HEADLibravatar Junio C Hamano44-368/+3318
2018-04-24Avoid multiple PREFIX definitionsLibravatar Philip Oakley3-8/+8
2018-04-24git_setup_gettext: plug memory leakLibravatar Johannes Schindelin1-2/+7
2018-04-24gettext: avoid initialization if the locale dir is not presentLibravatar Johannes Schindelin1-0/+3
2018-04-24Makefile: quote $INSTLIBDIR when passing it to sedLibravatar Jonathan Nieder1-1/+1
2018-04-24Makefile: remove unused @@PERLLIBDIR@@ substitution variableLibravatar Jonathan Nieder1-1/+0
2018-04-24walker: drop fields of `struct walker` which are always 1Libravatar Martin Ågren4-20/+8
2018-04-24http-fetch: make `-a` standard behaviourLibravatar Martin Ågren3-23/+19
2018-04-24config: document the settings to colorize push errors/hintsLibravatar Johannes Schindelin1-0/+28
2018-04-24push: test to verify that push errors are coloredLibravatar Johannes Schindelin1-0/+12
2018-04-24push: colorize errorsLibravatar Ryan Dammrose4-5/+157
2018-04-24color: introduce support for colorizing stderrLibravatar Johannes Schindelin2-10/+14
2018-04-23builtin/config: introduce `color` type specifierLibravatar Taylor Blau3-0/+58
2018-04-23config.c: introduce 'git_config_color' to parse ANSI colorsLibravatar Taylor Blau2-0/+11
2018-04-23builtin/config: introduce `--default`Libravatar Taylor Blau3-0/+58
2018-04-23parseopt: handle malformed --expire arguments more nicelyLibravatar Junio C Hamano3-1/+19
2018-04-23gc: do not upcase error message shown with die()Libravatar Junio C Hamano1-1/+1
2018-04-21fast-export: fix regression skipping some merge-commitsLibravatar Martin Ågren2-1/+22
2018-04-20merge-recursive: make a helper function for cleanup for handle_renamesLibravatar Elijah Newren1-10/+13
2018-04-20merge-recursive: split out code for determining diff_filepairsLibravatar Elijah Newren1-22/+62
2018-04-20merge-recursive: make !o->detect_rename codepath more obviousLibravatar Elijah Newren1-2/+9
2018-04-20merge-recursive: fix leaks of allocated renames and diff_filepairsLibravatar Elijah Newren1-5/+15
2018-04-20merge-recursive: introduce new functions to handle rename logicLibravatar Elijah Newren1-10/+33
2018-04-20merge-recursive: move the get_renames() functionLibravatar Elijah Newren1-69/+70
2018-04-20directory rename detection: tests for handling overwriting dirty filesLibravatar Elijah Newren1-0/+458
2018-04-20directory rename detection: tests for handling overwriting untracked filesLibravatar Elijah Newren1-0/+367
2018-04-20directory rename detection: miscellaneous testcases to complete coverageLibravatar Elijah Newren1-1/+564
2018-04-20directory rename detection: testcases exploring possibly suboptimal mergesLibravatar Elijah Newren1-0/+404
2018-04-20directory rename detection: more involved edge/corner testcasesLibravatar Elijah Newren1-0/+396
2018-04-20directory rename detection: testcases checking which side did the renameLibravatar Elijah Newren1-0/+336
2018-04-20directory rename detection: files/directories in the way of some renamesLibravatar Elijah Newren1-0/+330
2018-04-20directory rename detection: partially renamed directory testcase/discussionLibravatar Elijah Newren1-0/+115
2018-04-20directory rename detection: testcases to avoid taking detection too farLibravatar Elijah Newren1-0/+153
2018-04-20directory rename detection: directory splitting testcasesLibravatar Elijah Newren1-0/+143
2018-04-20directory rename detection: basic testcasesLibravatar Elijah Newren1-0/+442
2018-04-20completion: make stash -p and alias for stash push -pLibravatar Thomas Gummerer1-0/+3
2018-04-20completion: stop showing 'save' for stash by defaultLibravatar Thomas Gummerer1-2/+7
2018-04-20doc/clone: update caption for GIT URLS cross-referenceLibravatar Todd Zullinger1-1/+1
2018-04-19builtin/config.c: support `--type=<type>` as preferred alias for `--<type>`Libravatar Taylor Blau3-40/+154