summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/clone-dissociate' into maintJunio C Hamano2015-06-161-13/+4
|\
| * clone: reorder --dissociate and --reference optionsjk/clone-dissociateJeff King2015-05-271-2/+2
| * clone: use OPT_STRING_LIST for --referenceJeff King2015-05-271-11/+2
* | Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-162-2/+2
|\ \
| * | blame, log: format usage strings similarly to those in documentationah/usage-stringsAlex Henrie2015-05-032-2/+2
* | | Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-163-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 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano2015-06-161-3/+3
|\ \ \ \
| * | | | clean: only lstat files in pathspecdt/clean-pathspec-filter-then-lstatDavid Turner2015-05-181-3/+3
* | | | | Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-051-3/+3
|\ \ \ \ \
| * | | | | branch: do not call a "remote-tracking branch" a "remote branch"dl/branch-error-messageDanny Lin2015-05-061-3/+3
* | | | | | Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-051-0/+8
|\ \ \ \ \ \
| * | | | | | bundle: verify arguments more strictlyps/bundle-verify-argPatrick Steinhardt2015-05-081-0/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-051-1/+2
|\ \ \ \ \ \
| * | | | | | add: check return value of launch_editorjk/add-e-kill-editorJeff King2015-05-121-1/+2
| |/ / / / /
* | | | | | Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano2015-06-051-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/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2015-06-051-3/+1
|\ \ \ \ \ \ \
| * | | | | | | sha1_file: squelch "packfile cannot be accessed" warningsjk/sha1-file-reduce-useless-warningsJeff King2015-03-301-3/+1
* | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-051-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: CRLF in the working tree and LF in the repotb/blame-resurrect-convert-to-gitTorsten Bögershausen2015-05-031-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano2015-06-051-5/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | fmt-merge-msg: plug small leak of commit bufferjc/plug-fmt-merge-msg-leakJunio C Hamano2015-04-201-5/+11
* | | | | | | | | Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-052-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' into maintJunio C Hamano2015-05-261-3/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | hash-object --literally: fix buffer overrun with extra-long object typeEric Sunshine2015-05-051-3/+1
* | | | | | | | | Merge branch 'jk/init-core-worktree-at-root' into maintJunio C Hamano2015-05-131-3/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | init: don't set core.worktree when initializing /.gitjk/init-core-worktree-at-rootJeff King2015-04-021-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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | config: fix settings in default_user_config templateoh/fix-config-default-user-name-sectionOssi Herrala2015-04-171-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 'ps/grep-help-all-callback-arg'Junio C Hamano2015-04-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | grep: correctly initialize help-all optionps/grep-help-all-callback-argPatrick Steinhardt2015-04-121-1/+1
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano2015-04-161-4/+0
* | | | | | | | | | | | | | | | Merge branch 'jk/merge-quiet'Junio C Hamano2015-04-141-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | merge: pass verbosity flag down to merge-recursiveJeff King2015-04-021-0/+4
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jc/update-instead-into-void'Junio C Hamano2015-04-141-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | push-to-deploy: allow pushing into an unborn branch and updating itjc/update-instead-into-voidJunio C Hamano2015-04-011-1/+20
* | | | | | | | | | | | | | | | | Merge branch 'sb/leaks'Junio C Hamano2015-03-273-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | commit.c: fix a memory leakStefan Beller2015-03-231-2/+4
| * | | | | | | | | | | | | | | | | builtin/apply.c: fix a memleakStefan Beller2015-03-231-1/+3
View Lorry Controller Status