summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Sync with 2.3.10Junio C Hamano2015-09-284-8/+17
|\
| * merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-281-1/+2
| * react to errors in xdi_diffJeff King2015-09-283-7/+15
* | Sync with 2.3.9Junio C Hamano2015-09-041-2/+4
|\ \ | |/
| * Sync with 2.2.3Junio C Hamano2015-09-041-2/+4
| |\
| | * show-branch: use a strbuf for reflog descriptionsJeff King2015-09-041-2/+4
* | | Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano2015-08-031-13/+6
|\ \ \
| * | | clone: simplify string handling in guess_dir_name()ss/clone-guess-dir-name-simplifySebastian Schuberth2015-07-091-13/+6
* | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-031-0/+5
|\ \ \ \
| * | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-021-0/+5
| | |/ / | |/| |
* | | | Merge branch 'ls/hint-rev-list-count' into maintJunio C Hamano2015-07-271-0/+1
|\ \ \ \
| * | | | rev-list: add --count to usage guidels/hint-rev-list-countLawrence Siebert2015-07-011-0/+1
| | |/ / | |/| |
* | | | Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2015-07-271-1/+1
|\ \ \ \
| * | | | rev-list: disable --use-bitmap-index when pruning commitsjk/rev-list-no-bitmap-while-pruningJeff King2015-07-011-1/+1
* | | | | Merge branch 'jk/index-pack-reduce-recheck' into maintJunio C Hamano2015-07-271-1/+1
|\ \ \ \ \
| * | | | | index-pack: avoid excessive re-reading of pack directoryjk/index-pack-reduce-recheckJeff King2015-06-091-1/+1
| |/ / / /
* | | | | Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano2015-07-151-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 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2015-07-151-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 '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
View Lorry Controller Status