aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Sync with 2.3.10Junio C Hamano2015-09-28
|\
| * merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-28
| * react to errors in xdi_diffJeff King2015-09-28
* | Sync with 2.3.9Junio C Hamano2015-09-04
|\ \ | |/
| * Sync with 2.2.3Junio C Hamano2015-09-04
| |\
| | * show-branch: use a strbuf for reflog descriptionsJeff King2015-09-04
* | | Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano2015-08-03
|\ \ \
| * | | clone: simplify string handling in guess_dir_name()Sebastian Schuberth2015-07-09
* | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-03
|\ \ \ \
| * | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-02
| | |/ / | |/| |
* | | | Merge branch 'ls/hint-rev-list-count' into maintJunio C Hamano2015-07-27
|\ \ \ \
| * | | | rev-list: add --count to usage guideLawrence Siebert2015-07-01
| | |/ / | |/| |
* | | | Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2015-07-27
|\ \ \ \
| * | | | rev-list: disable --use-bitmap-index when pruning commitsJeff King2015-07-01
* | | | | Merge branch 'jk/index-pack-reduce-recheck' into maintJunio C Hamano2015-07-27
|\ \ \ \ \
| * | | | | index-pack: avoid excessive re-reading of pack directoryJeff King2015-06-09
| |/ / / /
* | | | | Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano2015-07-15
|\ \ \ \ \
| * | | | | fsck: report errors if reflog entries point at invalid objectsMichael Haggerty2015-06-08
| * | | | | fsck_handle_reflog_sha1(): new functionMichael Haggerty2015-06-08
* | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2015-07-15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | format-patch: do not feed tags to clear_commit_marks()Junio C Hamano2015-06-01
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/clone-dissociate' into maintJunio C Hamano2015-06-16
|\ \ \ \ \
| * | | | | clone: reorder --dissociate and --reference optionsJeff King2015-05-27
| * | | | | clone: use OPT_STRING_LIST for --referenceJeff King2015-05-27
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-16
|\ \ \ \ \
| * | | | | blame, log: format usage strings similarly to those in documentationAlex Henrie2015-05-03
* | | | | | Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-16
|\ \ \ \ \ \
| * | | | | | 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 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano2015-06-16
|\ \ \ \ \ \ \
| * | | | | | | clean: only lstat files in pathspecDavid Turner2015-05-18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \
| * | | | | | | branch: do not call a "remote-tracking branch" a "remote branch"Danny Lin2015-05-06
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \
| * | | | | | | bundle: verify arguments more strictlyPatrick Steinhardt2015-05-08
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \
| * | | | | | | add: check return value of launch_editorJeff King2015-05-12
| |/ / / / / /
* | | | | | | Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \
| * | | | | | | clone: call transport_set_verbosity before anything else on the newly created...Mike Hommey2015-05-19
* | | | | | | | Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1_file: squelch "packfile cannot be accessed" warningsJeff King2015-03-30
* | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: CRLF in the working tree and LF in the repoTorsten Bögershausen2015-05-03
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fmt-merge-msg: plug small leak of commit bufferJunio C Hamano2015-04-20
* | | | | | | | | | Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-config: replace use of home_config_paths()Paul Tan2015-05-06
| * | | | | | | | | | git-commit: replace use of home_config_paths()Paul Tan2015-05-06
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | hash-object --literally: fix buffer overrun with extra-long object typeEric Sunshine2015-05-05