summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Allow to control where the replace refs are looked formh/replace-refsMike Hommey2015-06-121-3/+3
* Merge branch 'dt/cat-file-follow-symlinks'Junio C Hamano2015-06-011-6/+45
|\
| * cat-file: add --follow-symlinks to --batchdt/cat-file-follow-symlinksDavid Turner2015-05-201-6/+45
* | Merge branch 'rs/janitorial'Junio C Hamano2015-06-013-16/+4
|\ \
| * | clean: remove unused variable bufRené Scharfe2015-05-201-2/+0
| * | use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-202-14/+4
| * | Merge branch 'jk/init-core-worktree-at-root' into maintJunio C Hamano2015-05-131-3/+15
| |\ \
| * \ \ Sync with 2.3.8Junio C Hamano2015-05-111-2/+2
| |\ \ \
| | * \ \ Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Junio C Hamano2015-05-111-2/+2
| | |\ \ \
| | * \ \ \ Merge branch 'jc/report-path-error-to-dir' into maintJunio C Hamano2015-03-311-43/+0
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'ws/grep-quiet-no-pager' into maintJunio C Hamano2015-03-281-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jk/cleanup-failed-clone' into maintJunio C Hamano2015-03-281-5/+6
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jk/prune-with-corrupt-refs' into maintJunio C Hamano2015-03-282-2/+7
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'jk/tag-h-column-is-a-listing-option' into maintJunio C Hamano2015-03-271-2/+2
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano2015-03-232-3/+0
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ Merge branch 'ah/usage-strings'Junio C Hamano2015-06-012-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blame, log: format usage strings similarly to those in documentationah/usage-stringsAlex Henrie2015-05-032-2/+2
* | | | | | | | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat'Junio C Hamano2015-06-011-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clean: only lstat files in pathspecdt/clean-pathspec-filter-then-lstatDavid Turner2015-05-181-3/+3
* | | | | | | | | | | | | | 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...mh/clone-verbosity-fixMike 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_editorjk/add-e-kill-editorJeff King2015-05-121-1/+2
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ps/bundle-verify-arg'Junio C Hamano2015-05-221-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | bundle: verify arguments more strictlyps/bundle-verify-argPatrick 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"dl/branch-error-messageDanny 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>' syntaxjc/mergeJunio 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