summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-262-2/+191
|\
| * untracked cache: guard and disable on system changesNguyễn Thái Ngọc Duy2015-03-121-6/+10
| * update-index: test the system before enabling untracked cacheNguyễn Thái Ngọc Duy2015-03-121-0/+168
| * update-index: manually enable or disable untracked cacheNguyễn Thái Ngọc Duy2015-03-121-0/+16
| * status: enable untracked cacheNguyễn Thái Ngọc Duy2015-03-121-2/+3
* | Merge branch 'mh/clone-verbosity-fix'Junio C Hamano2015-05-221-2/+2
|\ \
| * | clone: call transport_set_verbosity before anything else on the newly created...Mike Hommey2015-05-191-2/+2
* | | Merge branch 'jk/add-e-kill-editor'Junio C Hamano2015-05-221-1/+2
|\ \ \
| * | | add: check return value of launch_editorJeff King2015-05-131-1/+2
* | | | Merge branch 'ps/bundle-verify-arg'Junio C Hamano2015-05-221-0/+8
|\ \ \ \
| * | | | bundle: verify arguments more strictlyPatrick Steinhardt2015-05-081-0/+8
| |/ / /
* | | | Merge branch 'dl/branch-error-message'Junio C Hamano2015-05-221-3/+3
|\ \ \ \
| * | | | branch: do not call a "remote-tracking branch" a "remote branch"Danny Lin2015-05-061-3/+3
* | | | | Merge branch 'kn/cat-file-literally'Junio C Hamano2015-05-191-20/+31
|\ \ \ \ \
| * | | | | cat-file: teach cat-file a '--allow-unknown-type' optionKarthik Nayak2015-05-061-12/+26
| * | | | | cat-file: make the options mutually exclusiveKarthik Nayak2015-05-061-8/+5
* | | | | | Merge branch 'jc/merge'Junio C Hamano2015-05-191-87/+161
|\ \ \ \ \ \
| * | | | | | merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano2015-04-291-0/+1
| * | | | | | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-291-34/+72
| * | | | | | merge: decide if we auto-generate the message early in collect_parents()Junio C Hamano2015-04-291-7/+9
| * | | | | | merge: make collect_parents() auto-generate the merge messageJunio C Hamano2015-04-291-14/+22
| * | | | | | merge: extract prepare_merge_message() logic outJunio C Hamano2015-04-291-11/+15
| * | | | | | merge: narrow scope of merge_namesJunio C Hamano2015-04-291-4/+7
| * | | | | | merge: split reduce_parents() out of collect_parents()Junio C Hamano2015-04-291-16/+25
| * | | | | | merge: clarify collect_parents() logicJunio C Hamano2015-04-291-2/+11
| * | | | | | merge: small leakfix and code simplificationJunio C Hamano2015-04-291-2/+2
| * | | | | | merge: do not check argc to determine number of remote headsJunio C Hamano2015-04-291-3/+2
| * | | | | | merge: clarify "pulling into void" special caseJunio C Hamano2015-04-291-17/+18
| * | | | | | merge: simplify code flowJunio C Hamano2015-04-291-8/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-05-191-0/+1
|\ \ \ \ \ \
| * | | | | | diff-lib.c: adjust position of i-t-a entries in diffNguyễn Thái Ngọc Duy2015-03-231-0/+1
* | | | | | | Merge branch 'pt/xdg-config-path'Junio C Hamano2015-05-112-9/+5
|\ \ \ \ \ \ \
| * | | | | | | git-config: replace use of home_config_paths()Paul Tan2015-05-061-4/+2
| * | | | | | | git-commit: replace use of home_config_paths()Paul Tan2015-05-061-5/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jc/hash-object'Junio C Hamano2015-05-111-3/+1
|\ \ \ \ \ \ \
| * | | | | | | hash-object --literally: fix buffer overrun with extra-long object typeEric Sunshine2015-05-051-3/+1
* | | | | | | | Merge branch 'sb/prefix-path-free-results'Junio C Hamano2015-05-112-13/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | prefix_path(): unconditionally free results in the callersStefan Beller2015-05-052-13/+10
* | | | | | | | | Merge branch 'jn/clean-use-error-not-fprintf-on-stderr'Junio C Hamano2015-05-111-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config: use error() instead of fprintf(stderr, ...)Jonathan Nieder2015-05-041-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git'Junio C Hamano2015-05-111-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: CRLF in the working tree and LF in the repoTorsten Bögershausen2015-05-031-0/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/plug-fmt-merge-msg-leak'Junio C Hamano2015-05-111-5/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fmt-merge-msg: plug small leak of commit bufferJunio C Hamano2015-04-201-5/+11
* | | | | | | | | | Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano2015-05-111-111/+179
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | index-pack: kill union delta_base to save memoryNguyễn Thái Ngọc Duy2015-04-191-100/+160
| * | | | | | | | | | index-pack: reduce object_entry size to save memoryNguyễn Thái Ngọc Duy2015-02-271-11/+19
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/sha1-file-reduce-useless-warnings'Junio C Hamano2015-05-111-3/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sha1_file: squelch "packfile cannot be accessed" warningsJeff King2015-03-311-3/+1
* | | | | | | | | | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-1114-47/+413
|\ \ \ \ \ \ \ \ \ \ \