Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 |
|\ | |||
| * | merge-file: enforce MAX_XDIFF_SIZE on incoming files | Jeff King | 2015-09-28 |
| * | react to errors in xdi_diff | Jeff King | 2015-09-28 |
* | | Sync with 2.3.9 | Junio C Hamano | 2015-09-04 |
|\ \ | |/ | |||
| * | Sync with 2.2.3 | Junio C Hamano | 2015-09-04 |
| |\ | |||
| | * | show-branch: use a strbuf for reflog descriptions | Jeff King | 2015-09-04 |
* | | | Merge branch 'ss/clone-guess-dir-name-simplify' into maint | Junio C Hamano | 2015-08-03 |
|\ \ \ | |||
| * | | | clone: simplify string handling in guess_dir_name() | Sebastian Schuberth | 2015-07-09 |
* | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint | Junio C Hamano | 2015-08-03 |
|\ \ \ \ | |||
| * | | | | for-each-ref: report broken references correctly | Michael Haggerty | 2015-06-02 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'ls/hint-rev-list-count' into maint | Junio C Hamano | 2015-07-27 |
|\ \ \ \ | |||
| * | | | | rev-list: add --count to usage guide | Lawrence Siebert | 2015-07-01 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maint | Junio C Hamano | 2015-07-27 |
|\ \ \ \ | |||
| * | | | | rev-list: disable --use-bitmap-index when pruning commits | Jeff King | 2015-07-01 |
* | | | | | Merge branch 'jk/index-pack-reduce-recheck' into maint | Junio C Hamano | 2015-07-27 |
|\ \ \ \ \ | |||
| * | | | | | index-pack: avoid excessive re-reading of pack directory | Jeff King | 2015-06-09 |
| |/ / / / | |||
* | | | | | Merge branch 'mh/fsck-reflog-entries' into maint | Junio C Hamano | 2015-07-15 |
|\ \ \ \ \ | |||
| * | | | | | fsck: report errors if reflog entries point at invalid objects | Michael Haggerty | 2015-06-08 |
| * | | | | | fsck_handle_reflog_sha1(): new function | Michael Haggerty | 2015-06-08 |
* | | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint | Junio C Hamano | 2015-07-15 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||
| * | | | | | format-patch: do not feed tags to clear_commit_marks() | Junio C Hamano | 2015-06-01 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'jk/clone-dissociate' into maint | Junio C Hamano | 2015-06-16 |
|\ \ \ \ \ | |||
| * | | | | | clone: reorder --dissociate and --reference options | Jeff King | 2015-05-27 |
| * | | | | | clone: use OPT_STRING_LIST for --reference | Jeff King | 2015-05-27 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'ah/usage-strings' into maint | Junio C Hamano | 2015-06-16 |
|\ \ \ \ \ | |||
| * | | | | | blame, log: format usage strings similarly to those in documentation | Alex Henrie | 2015-05-03 |
* | | | | | | Merge branch 'rs/janitorial' into maint | Junio C Hamano | 2015-06-16 |
|\ \ \ \ \ \ | |||
| * | | | | | | clean: remove unused variable buf | René Scharfe | 2015-05-20 |
| * | | | | | | use file_exists() to check if a file exists in the worktree | René Scharfe | 2015-05-20 |
* | | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint | Junio C Hamano | 2015-06-16 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | clean: only lstat files in pathspec | David Turner | 2015-05-18 |
| | |_|_|_|_|/ | |/| | | | | | |||
* | | | | | | | Merge branch 'dl/branch-error-message' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | branch: do not call a "remote-tracking branch" a "remote branch" | Danny Lin | 2015-05-06 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'ps/bundle-verify-arg' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | bundle: verify arguments more strictly | Patrick Steinhardt | 2015-05-08 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/add-e-kill-editor' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | add: check return value of launch_editor | Jeff King | 2015-05-12 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'mh/clone-verbosity-fix' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | clone: call transport_set_verbosity before anything else on the newly created... | Mike Hommey | 2015-05-19 |
* | | | | | | | | Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | sha1_file: squelch "packfile cannot be accessed" warnings | Jeff King | 2015-03-30 |
* | | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | blame: CRLF in the working tree and LF in the repo | Torsten Bögershausen | 2015-05-03 |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jc/plug-fmt-merge-msg-leak' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | fmt-merge-msg: plug small leak of commit buffer | Junio C Hamano | 2015-04-20 |
* | | | | | | | | | | Merge branch 'pt/xdg-config-path' into maint | Junio C Hamano | 2015-06-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | git-config: replace use of home_config_paths() | Paul Tan | 2015-05-06 |
| * | | | | | | | | | | git-commit: replace use of home_config_paths() | Paul Tan | 2015-05-06 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jc/hash-object' into maint | Junio C Hamano | 2015-05-26 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||
| * | | | | | | | | | hash-object --literally: fix buffer overrun with extra-long object type | Eric Sunshine | 2015-05-05 |