aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'dt/cat-file-follow-symlinks'Junio C Hamano2015-06-01
|\
| * cat-file: add --follow-symlinks to --batchDavid Turner2015-05-20
* | Merge branch 'rs/janitorial'Junio C Hamano2015-06-01
|\ \
| * | clean: remove unused variable bufRené Scharfe2015-05-20
| * | use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-20
| * | Merge branch 'jk/init-core-worktree-at-root' into maintJunio C Hamano2015-05-13
| |\ \
| * \ \ Sync with 2.3.8Junio C Hamano2015-05-11
| |\ \ \
| | * \ \ Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Junio C Hamano2015-05-11
| | |\ \ \
| | * \ \ \ Merge branch 'jc/report-path-error-to-dir' into maintJunio C Hamano2015-03-31
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'ws/grep-quiet-no-pager' into maintJunio C Hamano2015-03-28
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jk/cleanup-failed-clone' into maintJunio C Hamano2015-03-28
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jk/prune-with-corrupt-refs' into maintJunio C Hamano2015-03-28
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'jk/tag-h-column-is-a-listing-option' into maintJunio C Hamano2015-03-27
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano2015-03-23
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ Merge branch 'ah/usage-strings'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blame, log: format usage strings similarly to those in documentationAlex Henrie2015-05-03
* | | | | | | | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clean: only lstat files in pathspecDavid Turner2015-05-18
* | | | | | | | | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | untracked cache: guard and disable on system changesNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | update-index: test the system before enabling untracked cacheNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | update-index: manually enable or disable untracked cacheNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | status: enable untracked cacheNguyễn Thái Ngọc Duy2015-03-12
* | | | | | | | | | | | | | | Merge branch 'mh/clone-verbosity-fix'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | clone: call transport_set_verbosity before anything else on the newly created...Mike Hommey2015-05-19
* | | | | | | | | | | | | | | | Merge branch 'jk/add-e-kill-editor'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add: check return value of launch_editorJeff King2015-05-12
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ps/bundle-verify-arg'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | bundle: verify arguments more strictlyPatrick Steinhardt2015-05-08
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'dl/branch-error-message'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | branch: do not call a "remote-tracking branch" a "remote branch"Danny Lin2015-05-06
* | | | | | | | | | | | | | | | | Merge branch 'kn/cat-file-literally'Junio C Hamano2015-05-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | cat-file: teach cat-file a '--allow-unknown-type' optionKarthik Nayak2015-05-06
| * | | | | | | | | | | | | | | | | cat-file: make the options mutually exclusiveKarthik Nayak2015-05-06
* | | | | | | | | | | | | | | | | | Merge branch 'jc/merge'Junio C Hamano2015-05-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: decide if we auto-generate the message early in collect_parents()Junio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: make collect_parents() auto-generate the merge messageJunio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: extract prepare_merge_message() logic outJunio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: narrow scope of merge_namesJunio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: split reduce_parents() out of collect_parents()Junio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: clarify collect_parents() logicJunio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: small leakfix and code simplificationJunio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: do not check argc to determine number of remote headsJunio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: clarify "pulling into void" special caseJunio C Hamano2015-04-29
| * | | | | | | | | | | | | | | | | | merge: simplify code flowJunio C Hamano2015-04-29
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-05-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | diff-lib.c: adjust position of i-t-a entries in diffNguyễn Thái Ngọc Duy2015-03-23
* | | | | | | | | | | | | | | | | | | Merge branch 'pt/xdg-config-path'Junio C Hamano2015-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \