summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ep/trace-doc-sample-fix'Junio C Hamano2016-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | api-trace.txt: fix typoep/trace-doc-sample-fixElia Pinto2016-04-051-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/makefile-redirection-stderr'Junio C Hamano2016-04-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: fix misdirected redirectionsjc/makefile-redirection-stderrJunio C Hamano2016-04-051-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lt/pretty-expand-tabs'Junio C Hamano2016-04-139-10/+220
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: test --expand-tabslt/pretty-expand-tabsJunio C Hamano2016-04-041-0/+105
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: allow tweaking tabwidth in --expand-tabsJunio C Hamano2016-03-304-13/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formatsJunio C Hamano2016-03-306-9/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: expand tabs in indented logs to make things line up properlyLinus Torvalds2016-03-306-2/+79
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mj/pull-rebase-autostash'Junio C Hamano2016-04-133-10/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: test --[no-]autostash with pull.rebase=truemj/pull-rebase-autostashMehul Jain2016-04-041-0/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: reduce commom lines of codeMehul Jain2016-04-041-9/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "failing autostash" codeMehul Jain2016-04-041-15/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "successful autostash" codeMehul Jain2016-04-041-29/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use better test to check stderr outputMehul Jain2016-04-041-6/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: ensure consistent test conditionsMehul Jain2016-04-041-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use consistent capitalization in test titlesMehul Jain2016-04-041-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-213-0/+91
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-pull.c: introduce git_pull_config()Mehul Jain2016-03-211-3/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/mergetools-examdiff'Junio C Hamano2016-04-133-20/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools: add support for ExamDiffjn/mergetools-examdiffJacob Nisnevich2016-04-041-0/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich2016-04-042-20/+26
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/format-patch-doc-hide-no-patch'Junio C Hamano2016-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-format-patch.txt: don't show -s as shorthand for multiple optionses/format-patch-doc-hide-no-patchEric Sunshine2016-04-041-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests-2.8'Junio C Hamano2016-04-132-11/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: shorten code by re-using convert_slashes()js/mingw-tests-2.8Johannes Sixt2016-04-042-11/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/apply'Junio C Hamano2016-04-131-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: free patch when parse_chunk() failscc/applyChristian Couder2016-04-011-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: handle parse_binary() failureChristian Couder2016-04-011-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano2016-03-221-6/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: get rid of useless 'name' variableChristian Couder2016-03-221-8/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-04-134-11/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | credential-cache, send_request: close fd when doneStefan Beller2016-04-011-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bundle: don't leak an fd in case of early returnStefan Beller2016-04-011-6/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abbrev_sha1_in_line: don't leak memoryStefan Beller2016-04-011-3/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: don't leak memory in git_config_get_notes_strategyStefan Beller2016-04-011-2/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sk/send-pack-all-fix'Junio C Hamano2016-04-132-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fixStanislav Kolotinskiy2016-03-312-1/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/diff-multiple-identical-renames'Junio C Hamano2016-04-132-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diffcore: fix iteration order of identical files during rename detectionsg/diff-multiple-identical-renamesSZEDER Gábor2016-03-302-2/+15
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kn/for-each-tag-branch'Junio C Hamano2016-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for-each-ref: fix description of '--contains' in manpagekn/for-each-tag-branchSZEDER Gábor2016-03-301-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ky/branch-d-worktree'Junio C Hamano2016-04-132-8/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktreeKazuki Yamaguchi2016-03-292-8/+20
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rz/worktree-no-checkout'Junio C Hamano2016-04-133-12/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add: introduce --checkout optionrz/worktree-no-checkoutRay Zhang2016-03-293-12/+37
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/rebase-i-shorten-stop-report'Junio C Hamano2016-04-131-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase-i: print an abbreviated hash when stop for editingrt/rebase-i-shorten-stop-reportRalf Thielow2016-03-281-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/completion-help'Junio C Hamano2016-04-131-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: add 'revisions' and 'everyday' to 'git help'rt/completion-helpRalf Thielow2016-03-241-2/+2