Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ep/trace-doc-sample-fix' | Junio C Hamano | 2016-04-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | api-trace.txt: fix typoep/trace-doc-sample-fix | Elia Pinto | 2016-04-05 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/makefile-redirection-stderr' | Junio C Hamano | 2016-04-13 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: fix misdirected redirectionsjc/makefile-redirection-stderr | Junio C Hamano | 2016-04-05 | 1 | -2/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lt/pretty-expand-tabs' | Junio C Hamano | 2016-04-13 | 9 | -10/+220 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: test --expand-tabslt/pretty-expand-tabs | Junio C Hamano | 2016-04-04 | 1 | -0/+105 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: allow tweaking tabwidth in --expand-tabs | Junio C Hamano | 2016-03-30 | 4 | -13/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formats | Junio C Hamano | 2016-03-30 | 6 | -9/+28 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: expand tabs in indented logs to make things line up properly | Linus Torvalds | 2016-03-30 | 6 | -2/+79 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mj/pull-rebase-autostash' | Junio C Hamano | 2016-04-13 | 3 | -10/+103 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: test --[no-]autostash with pull.rebase=truemj/pull-rebase-autostash | Mehul Jain | 2016-04-04 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: reduce commom lines of code | Mehul Jain | 2016-04-04 | 1 | -9/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "failing autostash" code | Mehul Jain | 2016-04-04 | 1 | -15/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "successful autostash" code | Mehul Jain | 2016-04-04 | 1 | -29/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use better test to check stderr output | Mehul Jain | 2016-04-04 | 1 | -6/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: ensure consistent test conditions | Mehul Jain | 2016-04-04 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use consistent capitalization in test titles | Mehul Jain | 2016-04-04 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull --rebase: add --[no-]autostash flag | Mehul Jain | 2016-03-21 | 3 | -0/+91 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-pull.c: introduce git_pull_config() | Mehul Jain | 2016-03-21 | 1 | -3/+15 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/mergetools-examdiff' | Junio C Hamano | 2016-04-13 | 3 | -20/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools: add support for ExamDiffjn/mergetools-examdiff | Jacob Nisnevich | 2016-04-04 | 1 | -0/+18 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools: create mergetool_find_win32_cmd() helper function for winmerge | Jacob Nisnevich | 2016-04-04 | 2 | -20/+26 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/format-patch-doc-hide-no-patch' | Junio C Hamano | 2016-04-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-format-patch.txt: don't show -s as shorthand for multiple optionses/format-patch-doc-hide-no-patch | Eric Sunshine | 2016-04-04 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests-2.8' | Junio C Hamano | 2016-04-13 | 2 | -11/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: shorten code by re-using convert_slashes()js/mingw-tests-2.8 | Johannes Sixt | 2016-04-04 | 2 | -11/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/apply' | Junio C Hamano | 2016-04-13 | 1 | -15/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: free patch when parse_chunk() failscc/apply | Christian Couder | 2016-04-01 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: handle parse_binary() failure | Christian Couder | 2016-04-01 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply: remove unused call to free() in gitdiff_{old,new}name() | Junio C Hamano | 2016-03-22 | 1 | -6/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: get rid of useless 'name' variable | Christian Couder | 2016-03-22 | 1 | -8/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/misc-cleanups' | Junio C Hamano | 2016-04-13 | 4 | -11/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | credential-cache, send_request: close fd when done | Stefan Beller | 2016-04-01 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bundle: don't leak an fd in case of early return | Stefan Beller | 2016-04-01 | 1 | -6/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abbrev_sha1_in_line: don't leak memory | Stefan Beller | 2016-04-01 | 1 | -3/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: don't leak memory in git_config_get_notes_strategy | Stefan Beller | 2016-04-01 | 1 | -2/+3 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sk/send-pack-all-fix' | Junio C Hamano | 2016-04-13 | 2 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fix | Stanislav Kolotinskiy | 2016-03-31 | 2 | -1/+13 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/diff-multiple-identical-renames' | Junio C Hamano | 2016-04-13 | 2 | -2/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diffcore: fix iteration order of identical files during rename detectionsg/diff-multiple-identical-renames | SZEDER Gábor | 2016-03-30 | 2 | -2/+15 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kn/for-each-tag-branch' | Junio C Hamano | 2016-04-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for-each-ref: fix description of '--contains' in manpagekn/for-each-tag-branch | SZEDER Gábor | 2016-03-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ky/branch-d-worktree' | Junio C Hamano | 2016-04-13 | 2 | -8/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktree | Kazuki Yamaguchi | 2016-03-29 | 2 | -8/+20 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rz/worktree-no-checkout' | Junio C Hamano | 2016-04-13 | 3 | -12/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add: introduce --checkout optionrz/worktree-no-checkout | Ray Zhang | 2016-03-29 | 3 | -12/+37 | |
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/rebase-i-shorten-stop-report' | Junio C Hamano | 2016-04-13 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase-i: print an abbreviated hash when stop for editingrt/rebase-i-shorten-stop-report | Ralf Thielow | 2016-03-28 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/completion-help' | Junio C Hamano | 2016-04-13 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: add 'revisions' and 'everyday' to 'git help'rt/completion-help | Ralf Thielow | 2016-03-24 | 1 | -2/+2 |