aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'mg/complete-cherry-mark-to-log'Junio C Hamano2016-04-13
|\
| * completion: complete --cherry-mark for git logMichael J Gruber2016-04-05
* | Merge branch 'ep/trace-doc-sample-fix'Junio C Hamano2016-04-13
|\ \
| * | api-trace.txt: fix typoElia Pinto2016-04-05
| |/
* | Merge branch 'jc/makefile-redirection-stderr'Junio C Hamano2016-04-13
|\ \
| * | Makefile: fix misdirected redirectionsJunio C Hamano2016-04-05
| |/
* | Merge branch 'lt/pretty-expand-tabs'Junio C Hamano2016-04-13
|\ \
| * | pretty: test --expand-tabsJunio C Hamano2016-04-04
| * | pretty: allow tweaking tabwidth in --expand-tabsJunio C Hamano2016-03-30
| * | pretty: enable --expand-tabs by default for selected pretty formatsJunio C Hamano2016-03-30
| * | pretty: expand tabs in indented logs to make things line up properlyLinus Torvalds2016-03-30
* | | Merge branch 'mj/pull-rebase-autostash'Junio C Hamano2016-04-13
|\ \ \
| * | | t5520: test --[no-]autostash with pull.rebase=trueMehul Jain2016-04-04
| * | | t5520: reduce commom lines of codeMehul Jain2016-04-04
| * | | t5520: factor out common "failing autostash" codeMehul Jain2016-04-04
| * | | t5520: factor out common "successful autostash" codeMehul Jain2016-04-04
| * | | t5520: use better test to check stderr outputMehul Jain2016-04-04
| * | | t5520: ensure consistent test conditionsMehul Jain2016-04-04
| * | | t5520: use consistent capitalization in test titlesMehul Jain2016-04-04
| * | | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-21
| * | | git-pull.c: introduce git_pull_config()Mehul Jain2016-03-21
* | | | Merge branch 'jn/mergetools-examdiff'Junio C Hamano2016-04-13
|\ \ \ \
| * | | | mergetools: add support for ExamDiffJacob Nisnevich2016-04-04
| * | | | mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich2016-04-04
* | | | | Merge branch 'es/format-patch-doc-hide-no-patch'Junio C Hamano2016-04-13
|\ \ \ \ \
| * | | | | git-format-patch.txt: don't show -s as shorthand for multiple optionsEric Sunshine2016-04-04
| | |_|_|/ | |/| | |
* | | | | Merge branch 'js/mingw-tests-2.8'Junio C Hamano2016-04-13
|\ \ \ \ \
| * | | | | Windows: shorten code by re-using convert_slashes()Johannes Sixt2016-04-04
* | | | | | Merge branch 'cc/apply'Junio C Hamano2016-04-13
|\ \ \ \ \ \
| * | | | | | builtin/apply: free patch when parse_chunk() failsChristian Couder2016-04-01
| * | | | | | builtin/apply: handle parse_binary() failureChristian Couder2016-04-01
| * | | | | | apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano2016-03-22
| * | | | | | builtin/apply: get rid of useless 'name' variableChristian Couder2016-03-22
* | | | | | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \
| * | | | | | | credential-cache, send_request: close fd when doneStefan Beller2016-04-01
| * | | | | | | bundle: don't leak an fd in case of early returnStefan Beller2016-04-01
| * | | | | | | abbrev_sha1_in_line: don't leak memoryStefan Beller2016-04-01
| * | | | | | | notes: don't leak memory in git_config_get_notes_strategyStefan Beller2016-04-01
* | | | | | | | Merge branch 'sk/send-pack-all-fix'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \
| * | | | | | | | git-send-pack: fix --all option when used with directoryStanislav Kolotinskiy2016-03-31
* | | | | | | | | Merge branch 'sg/diff-multiple-identical-renames'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diffcore: fix iteration order of identical files during rename detectionSZEDER Gábor2016-03-30
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'kn/for-each-tag-branch'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | for-each-ref: fix description of '--contains' in manpageSZEDER Gábor2016-03-30
* | | | | | | | | | Merge branch 'ky/branch-d-worktree'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch -d: refuse deleting a branch which is currently checked outKazuki Yamaguchi2016-03-29
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rz/worktree-no-checkout'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | worktree: add: introduce --checkout optionRay Zhang2016-03-29
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rt/rebase-i-shorten-stop-report'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase-i: print an abbreviated hash when stop for editingRalf Thielow2016-03-28