Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/opt-cmdmode-doc' into maint | Junio C Hamano | 2016-04-14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/apply-doc' into maint | Junio C Hamano | 2016-04-14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/doc-recommend-performance-trace-to-file' into maint | Junio C Hamano | 2016-04-14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/lockfile-error-message' into maint | Junio C Hamano | 2016-04-14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start preparing for 2.8.2 | Junio C Hamano | 2016-04-13 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fourth batch for post 2.8 cycle | Junio C Hamano | 2016-04-13 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct blame for files commited with CRLF | Torsten Bögershausen | 2016-04-05 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/complete-cherry-mark-to-log' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: complete --cherry-mark for git log | Michael J Gruber | 2016-04-05 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ep/trace-doc-sample-fix' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api-trace.txt: fix typo | Elia Pinto | 2016-04-05 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/makefile-redirection-stderr' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: fix misdirected redirections | Junio C Hamano | 2016-04-05 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lt/pretty-expand-tabs' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: test --expand-tabs | Junio C Hamano | 2016-04-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: allow tweaking tabwidth in --expand-tabs | Junio C Hamano | 2016-03-30 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formats | Junio C Hamano | 2016-03-30 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: expand tabs in indented logs to make things line up properly | Linus Torvalds | 2016-03-30 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mj/pull-rebase-autostash' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: test --[no-]autostash with pull.rebase=true | Mehul Jain | 2016-04-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: reduce commom lines of code | Mehul Jain | 2016-04-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "failing autostash" code | Mehul Jain | 2016-04-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "successful autostash" code | Mehul Jain | 2016-04-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use better test to check stderr output | Mehul Jain | 2016-04-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: ensure consistent test conditions | Mehul Jain | 2016-04-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use consistent capitalization in test titles | Mehul Jain | 2016-04-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull --rebase: add --[no-]autostash flag | Mehul Jain | 2016-03-21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-pull.c: introduce git_pull_config() | Mehul Jain | 2016-03-21 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/mergetools-examdiff' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools: add support for ExamDiff | Jacob Nisnevich | 2016-04-04 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools: create mergetool_find_win32_cmd() helper function for winmerge | Jacob Nisnevich | 2016-04-04 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/format-patch-doc-hide-no-patch' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-format-patch.txt: don't show -s as shorthand for multiple options | Eric Sunshine | 2016-04-04 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests-2.8' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: shorten code by re-using convert_slashes() | Johannes Sixt | 2016-04-04 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/apply' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: free patch when parse_chunk() fails | Christian Couder | 2016-04-01 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: handle parse_binary() failure | Christian Couder | 2016-04-01 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply: remove unused call to free() in gitdiff_{old,new}name() | Junio C Hamano | 2016-03-22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: get rid of useless 'name' variable | Christian Couder | 2016-03-22 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/misc-cleanups' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | credential-cache, send_request: close fd when done | Stefan Beller | 2016-04-01 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bundle: don't leak an fd in case of early return | Stefan Beller | 2016-04-01 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abbrev_sha1_in_line: don't leak memory | Stefan Beller | 2016-04-01 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: don't leak memory in git_config_get_notes_strategy | Stefan Beller | 2016-04-01 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sk/send-pack-all-fix' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-send-pack: fix --all option when used with directory | Stanislav Kolotinskiy | 2016-03-31 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/diff-multiple-identical-renames' | Junio C Hamano | 2016-04-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diffcore: fix iteration order of identical files during rename detection | SZEDER Gábor | 2016-03-30 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |