Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am: implement 3-way mergept/am-in-C | Paul Tan | 2015-06-14 | 1 | -4/+129 |
* | cache-tree: introduce write_index_as_tree() | Paul Tan | 2015-06-14 | 2 | -12/+18 |
* | am: implement am --signoff | Paul Tan | 2015-06-14 | 1 | -0/+13 |
* | am: exit with user friendly message on patch failure | Paul Tan | 2015-06-14 | 1 | -3/+23 |
* | am: implement quiet option | Paul Tan | 2015-06-14 | 1 | -3/+33 |
* | am: implement --abort | Paul Tan | 2015-06-14 | 1 | -3/+92 |
* | am: implement --skip | Paul Tan | 2015-06-14 | 1 | -2/+119 |
* | am: implement --resolved/--continue | Paul Tan | 2015-06-14 | 1 | -1/+51 |
* | am: refuse to apply patches if index is dirty | Paul Tan | 2015-06-14 | 1 | -0/+46 |
* | am: refresh the index at start | Paul Tan | 2015-06-14 | 1 | -0/+20 |
* | am: commit applied patch | Paul Tan | 2015-06-14 | 1 | -4/+46 |
* | am: apply patch with git-apply | Paul Tan | 2015-06-14 | 1 | -1/+54 |
* | am: extract patch, message and authorship with git-mailinfo | Paul Tan | 2015-06-14 | 1 | -0/+228 |
* | am: detect mbox patches | Paul Tan | 2015-06-14 | 1 | -0/+98 |
* | am: split out mbox/maildir patches with git-mailsplit | Paul Tan | 2015-06-14 | 1 | -4/+103 |
* | am: implement patch queue mechanism | Paul Tan | 2015-06-14 | 1 | -0/+164 |
* | am: implement skeletal builtin am | Paul Tan | 2015-06-14 | 4 | -0/+23 |
* | wrapper: implement xfopen() | Paul Tan | 2015-06-14 | 2 | -0/+19 |
* | wrapper: implement xopen() | Paul Tan | 2015-06-14 | 2 | -0/+26 |
* | Merge branch 'mt/p4-depotFile-at-version' | Junio C Hamano | 2015-06-11 | 1 | -1/+1 |
|\ | |||||
| * | p4: retrieve the right revision of the file in UTF-16 codepathmt/p4-depotFile-at-version | Miguel Torroja | 2015-05-27 | 1 | -1/+1 |
* | | Merge branch 'mh/verify-lock-error-report' | Junio C Hamano | 2015-06-11 | 2 | -21/+33 |
|\ \ | |||||
| * | | ref_transaction_commit(): do not capitalize error messagesmh/verify-lock-error-report | Michael Haggerty | 2015-05-27 | 2 | -9/+9 |
| * | | verify_lock(): do not capitalize error messages | Michael Haggerty | 2015-05-27 | 1 | -2/+2 |
| * | | verify_lock(): report errors via a strbuf | Michael Haggerty | 2015-05-27 | 1 | -7/+12 |
| * | | verify_lock(): on errors, let the caller unlock the lock | Michael Haggerty | 2015-05-27 | 1 | -4/+4 |
| * | | verify_lock(): return 0/-1 rather than struct ref_lock * | Michael Haggerty | 2015-05-27 | 1 | -7/+14 |
* | | | Merge branch 'jk/color-diff-plain-is-context' | Junio C Hamano | 2015-06-11 | 5 | -23/+24 |
|\ \ \ | |||||
| * | | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-context | Jeff King | 2015-05-27 | 4 | -20/+20 |
| * | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |