Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 |
* | | | | | | | | | | Merge branch 'jk/init-core-worktree-at-root' into maint | Junio C Hamano | 2015-05-13 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | init: don't set core.worktree when initializing /.git | Jeff King | 2015-04-02 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Sync with 2.3.8 | Junio C Hamano | 2015-05-11 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||
| * | | | | | | | | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3 | Junio C Hamano | 2015-05-11 |
| |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | config: fix settings in default_user_config template | Ossi Herrala | 2015-04-17 |
| * | | | | | | | | | Merge branch 'jc/report-path-error-to-dir' into maint | Junio C Hamano | 2015-03-31 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ws/grep-quiet-no-pager' into maint | Junio C Hamano | 2015-03-28 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/cleanup-failed-clone' into maint | Junio C Hamano | 2015-03-28 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/prune-with-corrupt-refs' into maint | Junio C Hamano | 2015-03-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/tag-h-column-is-a-listing-option' into maint | Junio C Hamano | 2015-03-27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/deflate-init-cleanup' into maint | Junio C Hamano | 2015-03-23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/grep-help-all-callback-arg' | Junio C Hamano | 2015-04-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | grep: correctly initialize help-all option | Patrick Steinhardt | 2015-04-12 |
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Revert "merge: pass verbosity flag down to merge-recursive" | Junio C Hamano | 2015-04-16 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/merge-quiet' | Junio C Hamano | 2015-04-14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | merge: pass verbosity flag down to merge-recursive | Jeff King | 2015-04-02 |
| |/ / / / / / / / / / / / / / / |