Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dt/cat-file-follow-symlinks' | Junio C Hamano | 2015-06-01 | 1 | -6/+45 |
|\ | |||||
| * | cat-file: add --follow-symlinks to --batchdt/cat-file-follow-symlinks | David Turner | 2015-05-20 | 1 | -6/+45 |
* | | Merge branch 'rs/janitorial' | Junio C Hamano | 2015-06-01 | 3 | -16/+4 |
|\ \ | |||||
| * | | clean: remove unused variable buf | René Scharfe | 2015-05-20 | 1 | -2/+0 |
| * | | use file_exists() to check if a file exists in the worktree | René Scharfe | 2015-05-20 | 2 | -14/+4 |
| * | | Merge branch 'jk/init-core-worktree-at-root' into maint | Junio C Hamano | 2015-05-13 | 1 | -3/+15 |
| |\ \ | |||||
| * \ \ | Sync with 2.3.8 | Junio C Hamano | 2015-05-11 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'jc/report-path-error-to-dir' into maint | Junio C Hamano | 2015-03-31 | 1 | -43/+0 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'ws/grep-quiet-no-pager' into maint | Junio C Hamano | 2015-03-28 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'jk/cleanup-failed-clone' into maint | Junio C Hamano | 2015-03-28 | 1 | -5/+6 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'jk/prune-with-corrupt-refs' into maint | Junio C Hamano | 2015-03-28 | 2 | -2/+7 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'jk/tag-h-column-is-a-listing-option' into maint | Junio C Hamano | 2015-03-27 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'rs/deflate-init-cleanup' into maint | Junio C Hamano | 2015-03-23 | 2 | -3/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ | Merge branch 'ah/usage-strings' | Junio C Hamano | 2015-06-01 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | blame, log: format usage strings similarly to those in documentationah/usage-strings | Alex Henrie | 2015-05-03 | 2 | -2/+2 |
* | | | | | | | | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat' | Junio C Hamano | 2015-06-01 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | clean: only lstat files in pathspecdt/clean-pathspec-filter-then-lstat | David Turner | 2015-05-18 | 1 | -3/+3 |
* | | | | | | | | | | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-05-26 | 2 | -2/+191 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | untracked cache: guard and disable on system changes | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -6/+10 |
| * | | | | | | | | | | | | | | update-index: test the system before enabling untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -0/+168 |
| * | | | | | | | | | | | | | | update-index: manually enable or disable untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -0/+16 |
| * | | | | | | | | | | | | | | status: enable untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -2/+3 |
* | | | | | | | | | | | | | | | Merge branch 'mh/clone-verbosity-fix' | Junio C Hamano | 2015-05-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | clone: call transport_set_verbosity before anything else on the newly created...mh/clone-verbosity-fix | Mike Hommey | 2015-05-19 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/add-e-kill-editor' | Junio C Hamano | 2015-05-22 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | add: check return value of launch_editorjk/add-e-kill-editor | Jeff King | 2015-05-12 | 1 | -1/+2 |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'ps/bundle-verify-arg' | Junio C Hamano | 2015-05-22 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | bundle: verify arguments more strictlyps/bundle-verify-arg | Patrick Steinhardt | 2015-05-08 | 1 | -0/+8 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge branch 'dl/branch-error-message' | Junio C Hamano | 2015-05-22 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | branch: do not call a "remote-tracking branch" a "remote branch"dl/branch-error-message | Danny Lin | 2015-05-06 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | Merge branch 'kn/cat-file-literally' | Junio C Hamano | 2015-05-19 | 1 | -20/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | cat-file: teach cat-file a '--allow-unknown-type' option | Karthik Nayak | 2015-05-06 | 1 | -12/+26 |
| * | | | | | | | | | | | | | | | | | cat-file: make the options mutually exclusive | Karthik Nayak | 2015-05-06 | 1 | -8/+5 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/merge' | Junio C Hamano | 2015-05-19 | 1 | -87/+161 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/merge | Junio C Hamano | 2015-04-29 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | merge: handle FETCH_HEAD internally | Junio C Hamano | 2015-04-29 | 1 | -34/+72 |
| * | | | | | | | | | | | | | | | | | | merge: decide if we auto-generate the message early in collect_parents() | Junio C Hamano | 2015-04-29 | 1 | -7/+9 |
| * | | | | | | | | | | | | | | | | | | merge: make collect_parents() auto-generate the merge message | Junio C Hamano | 2015-04-29 | 1 | -14/+22 |
| * | | | | | | | | | | | | | | | | | | merge: extract prepare_merge_message() logic out | Junio C Hamano | 2015-04-29 | 1 | -11/+15 |
| * | | | | | | | | | | | | | | | | | | merge: narrow scope of merge_names | Junio C Hamano | 2015-04-29 | 1 | -4/+7 |
| * | | | | | | | | | | | | | | | | | | merge: split reduce_parents() out of collect_parents() | Junio C Hamano | 2015-04-29 | 1 | -16/+25 |
| * | | | | | | | | | | | | | | | | | | merge: clarify collect_parents() logic | Junio C Hamano | 2015-04-29 | 1 | -2/+11 |
| * | | | | | | | | | | | | | | | | | | merge: small leakfix and code simplification | Junio C Hamano | 2015-04-29 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | merge: do not check argc to determine number of remote heads | Junio C Hamano | 2015-04-29 | 1 | -3/+2 |
| * | | | | | | | | | | | | | | | | | | merge: clarify "pulling into void" special case | Junio C Hamano | 2015-04-29 | 1 | -17/+18 |
| * | | | | | | | | | | | | | | | | | | merge: simplify code flow | Junio C Hamano | 2015-04-29 | 1 | -8/+8 |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/diff-i-t-a' | Junio C Hamano | 2015-05-19 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | diff-lib.c: adjust position of i-t-a entries in diff | Nguyễn Thái Ngọc Duy | 2015-03-23 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'pt/xdg-config-path' | Junio C Hamano | 2015-05-11 | 2 | -9/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |