Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | diff: accept color.diff.context as a synonym for "plain" | Jeff King | 2015-05-27 | 2 | -2/+3 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge branch 'jk/clone-dissociate' | Junio C Hamano | 2015-06-11 | 1 | -13/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | clone: reorder --dissociate and --reference optionsjk/clone-dissociate | Jeff King | 2015-05-27 | 1 | -2/+2 | |
| * | | | | | | clone: use OPT_STRING_LIST for --reference | Jeff King | 2015-05-27 | 1 | -11/+2 | |
* | | | | | | | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-06-11 | 4 | -260/+385 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | diff.c: --ws-error-highlight=<kind> option | Junio C Hamano | 2015-05-26 | 4 | -16/+179 | |
| * | | | | | | | diff.c: add emit_del_line() and emit_context_line() | Junio C Hamano | 2015-05-26 | 1 | -12/+38 | |
| * | | | | | | | t4015: separate common setup and per-test expectation | Junio C Hamano | 2015-05-26 | 1 | -12/+13 | |
| * | | | | | | | t4015: modernise style | Junio C Hamano | 2015-05-26 | 1 | -238/+173 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Sync with 2.4.3 | Junio C Hamano | 2015-06-05 | 2 | -1/+78 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Git 2.4.3v2.4.3 | Junio C Hamano | 2015-06-05 | 4 | -3/+80 | |
| * | | | | | | | Merge branch 'dl/branch-error-message' into maint | Junio C Hamano | 2015-06-05 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/skip-http-tests-under-no-curl' into maint | Junio C Hamano | 2015-06-05 | 8 | -35/+13 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ps/doc-packfile-vs-pack-file' into maint | Junio C Hamano | 2015-06-05 | 3 | -9/+9 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'fg/document-commit-message-stripping' into maint | Junio C Hamano | 2015-06-05 | 1 | -4/+7 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rerere-forget-check-enabled' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/pull-log-n' into maint | Junio C Hamano | 2015-06-05 | 2 | -2/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/pull-ff-vs-merge-ff' into maint | Junio C Hamano | 2015-06-05 | 3 | -2/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint | Junio C Hamano | 2015-06-05 | 1 | -5/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ja/tutorial-asciidoctor-fix' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/stripspace-asciidoctor-fix' into maint | Junio C Hamano | 2015-06-05 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/asciidoc-markup-fix' into maint | Junio C Hamano | 2015-06-05 | 19 | -102/+107 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/bundle-verify-arg' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/write-refs-sooner-2.4' into maint | Junio C Hamano | 2015-06-05 | 3 | -33/+112 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/ref-directory-file' into maint | Junio C Hamano | 2015-06-05 | 3 | -118/+312 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/log-decorate-HEAD' into maint | Junio C Hamano | 2015-06-05 | 2 | -11/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/t1020-cleanup' into maint | Junio C Hamano | 2015-06-05 | 1 | -4/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/gitignore-precedence' into maint | Junio C Hamano | 2015-06-05 | 2 | -3/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/connect-plink' into maint | Junio C Hamano | 2015-06-05 | 2 | -22/+67 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ph/rebase-i-redo' into maint | Junio C Hamano | 2015-06-05 | 2 | -0/+63 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-e-kill-editor' into maint | Junio C Hamano | 2015-06-05 | 2 | -1/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/clone-verbosity-fix' into maint | Junio C Hamano | 2015-06-05 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint | Junio C Hamano | 2015-06-05 | 2 | -6/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/blame-resurrect-convert-to-git' into maint | Junio C Hamano | 2015-06-05 | 2 | -3/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/plug-fmt-merge-msg-leak' into maint | Junio C Hamano | 2015-06-05 | 1 | -5/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/xdg-config-path' into maint | Junio C Hamano | 2015-06-05 | 10 | -81/+243 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first half of the seventh batch for 2.5 | Junio C Hamano | 2015-06-05 | 1 | -0/+14 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-editor-multi-words' | Junio C Hamano | 2015-06-05 | 5 | -7/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: tests: use test-chmtime in place of touchld/p4-editor-multi-words | Luke Diamand | 2015-05-26 | 2 | -5/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: fix handling of multi-word P4EDITOR | Luke Diamand | 2015-05-24 | 3 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add failing test for P4EDITOR handling | Luke Diamand | 2015-05-24 | 1 | -0/+38 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2015-06-05 | 36 | -255/+300 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | struct ref_lock: convert old_sha1 member to object_id | Michael Haggerty | 2015-05-25 | 1 | -12/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warn_if_dangling_symref(): convert local variable "junk" to object_id | Michael Haggerty | 2015-05-25 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | each_ref_fn_adapter(): remove adapter | Michael Haggerty | 2015-05-25 | 2 | -19/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rev_list_insert_ref(): remove unneeded arguments | Michael Haggerty | 2015-05-25 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rev_list_insert_ref_oid(): new function, taking an object_oid | Michael Haggerty | 2015-05-25 | 1 | -3/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mark_complete(): remove unneeded arguments | Michael Haggerty | 2015-05-25 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mark_complete_oid(): new function, taking an object_oid | Michael Haggerty | 2015-05-25 | 1 | -4/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear_marks(): rewrite to take an object_id argument | Michael Haggerty | 2015-05-25 | 1 | -8/+5 |