Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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... | 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_editor | Jeff King | 2015-05-13 | 1 | -1/+2 |
* | | | | Merge branch 'ps/bundle-verify-arg' | Junio C Hamano | 2015-05-22 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | bundle: verify arguments more strictly | 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" | 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>' syntax | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-config: replace use of home_config_paths() | Paul Tan | 2015-05-06 | 1 | -4/+2 |
| * | | | | | | | git-commit: replace use of home_config_paths() | Paul Tan | 2015-05-06 | 1 | -5/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/hash-object' | Junio C Hamano | 2015-05-11 | 1 | -3/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | hash-object --literally: fix buffer overrun with extra-long object type | Eric Sunshine | 2015-05-05 | 1 | -3/+1 |
* | | | | | | | | Merge branch 'sb/prefix-path-free-results' | Junio C Hamano | 2015-05-11 | 2 | -13/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | prefix_path(): unconditionally free results in the callers | Stefan Beller | 2015-05-05 | 2 | -13/+10 |
* | | | | | | | | | Merge branch 'jn/clean-use-error-not-fprintf-on-stderr' | Junio C Hamano | 2015-05-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | config: use error() instead of fprintf(stderr, ...) | Jonathan Nieder | 2015-05-04 | 1 | -2/+2 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' | Junio C Hamano | 2015-05-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | blame: CRLF in the working tree and LF in the repo | Torsten Bögershausen | 2015-05-03 | 1 | -0/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/plug-fmt-merge-msg-leak' | Junio C Hamano | 2015-05-11 | 1 | -5/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fmt-merge-msg: plug small leak of commit buffer | Junio C Hamano | 2015-04-20 | 1 | -5/+11 |
* | | | | | | | | | | Merge branch 'nd/slim-index-pack-memory-usage' | Junio C Hamano | 2015-05-11 | 1 | -111/+179 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | index-pack: kill union delta_base to save memory | Nguyễn Thái Ngọc Duy | 2015-04-19 | 1 | -100/+160 |
| * | | | | | | | | | | index-pack: reduce object_entry size to save memory | Nguyễn Thái Ngọc Duy | 2015-02-27 | 1 | -11/+19 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/sha1-file-reduce-useless-warnings' | Junio C Hamano | 2015-05-11 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | sha1_file: squelch "packfile cannot be accessed" warnings | Jeff King | 2015-03-31 | 1 | -3/+1 |
* | | | | | | | | | | | Merge branch 'nd/multiple-work-trees' | Junio C Hamano | 2015-05-11 | 14 | -47/+413 |
|\ \ \ \ \ \ \ \ \ \ \ |