summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-134-112/+145
|\
| * worktree: new place for "git prune --worktrees"nd/multiple-work-treesNguyễn Thái Ngọc Duy2015-06-293-100/+134
| * checkout: don't check worktrees when not necessaryNguyễn Thái Ngọc Duy2015-06-121-12/+11
* | Merge branch 'ss/clone-guess-dir-name-simplify'Junio C Hamano2015-07-131-13/+6
|\ \
| * | clone: simplify string handling in guess_dir_name()ss/clone-guess-dir-name-simplifySebastian Schuberth2015-07-091-13/+6
* | | Merge branch 'ls/hint-rev-list-count'Junio C Hamano2015-07-101-0/+1
|\ \ \
| * | | rev-list: add --count to usage guidels/hint-rev-list-countLawrence Siebert2015-07-011-0/+1
| |/ /
| * | Merge branch 'jk/clone-dissociate' into maintJunio C Hamano2015-06-161-13/+4
| |\ \
| * \ \ Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-162-2/+2
| |\ \ \
| * \ \ \ Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-163-16/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano2015-06-161-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-051-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-051-0/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-051-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano2015-06-051-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2015-06-051-3/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-051-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano2015-06-051-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-052-9/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-261-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-no-bitmap-while-pruning'Junio C Hamano2015-07-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rev-list: disable --use-bitmap-index when pruning commitsjk/rev-list-no-bitmap-while-pruningJeff King2015-07-011-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'Junio C Hamano2015-07-091-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | index-pack: fix allocation of sorted_by_pos arrayjc/fix-alloc-sortbuf-in-index-packJunio C Hamano2015-07-041-8/+8
* | | | | | | | | | | | | | | | | | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-251-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-aJunio C Hamano2015-06-231-1/+0
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-reduce-recheck'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | index-pack: avoid excessive re-reading of pack directoryjk/index-pack-reduce-recheckJeff King2015-06-091-1/+1
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref'Junio C Hamano2015-06-241-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-021-0/+5
* | | | | | | | | | | | | | | | | | | | Merge branch 'mh/fsck-reflog-entries'Junio C Hamano2015-06-241-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | fsck: report errors if reflog entries point at invalid objectsmh/fsck-reflog-entriesMichael Haggerty2015-06-081-4/+9
| * | | | | | | | | | | | | | | | | | | | fsck_handle_reflog_sha1(): new functionMichael Haggerty2015-06-081-14/+15
* | | | | | | | | | | | | | | | | | | | | Merge branch 'qn/blame-show-email'Junio C Hamano2015-06-241-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | blame: add blame.showEmail configurationqn/blame-show-emailQuentin Neill2015-06-011-1/+9
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'Junio C Hamano2015-06-241-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | format-patch: do not feed tags to clear_commit_marks()jc/do-not-feed-tags-to-clear-commit-marksJunio C Hamano2015-06-011-6/+6
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano2015-06-241-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | apply: reject a hunk that does not do anythingjc/apply-reject-noop-hunkJunio C Hamano2015-06-011-0/+3
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano2015-06-161-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | index-pack: fix truncation of off_t in comparisonnd/slim-index-pack-memory-usageJeff King2015-06-041-2/+6
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/clone-dissociate'Junio C Hamano2015-06-111-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 'bc/object-id'Junio C Hamano2015-06-0516-122/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | builtin/show-ref: rewrite to take an object_id argumentMichael Haggerty2015-05-251-11/+9
| * | | | | | | | | | | | | | | | | | | | | show_ref(): convert local variable peeled to object_idMichael Haggerty2015-05-251-3/+3
| * | | | | | | | | | | | | | | | | | | | | builtin/show-ref: rewrite to use object_idMichael Haggerty2015-05-251-18/+15
| * | | | | | | | | | | | | | | | | | | | | fsck: change functions to use object_idMichael Haggerty2015-05-251-16/+13
| * | | | | | | | | | | | | | | | | | | | | cmd_show_branch(): fix error messageMichael Haggerty2015-05-251-1/+1
View Lorry Controller Status