summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* am: implement 3-way mergept/am-in-CPaul Tan2015-06-141-4/+129
* cache-tree: introduce write_index_as_tree()Paul Tan2015-06-142-12/+18
* am: implement am --signoffPaul Tan2015-06-141-0/+13
* am: exit with user friendly message on patch failurePaul Tan2015-06-141-3/+23
* am: implement quiet optionPaul Tan2015-06-141-3/+33
* am: implement --abortPaul Tan2015-06-141-3/+92
* am: implement --skipPaul Tan2015-06-141-2/+119
* am: implement --resolved/--continuePaul Tan2015-06-141-1/+51
* am: refuse to apply patches if index is dirtyPaul Tan2015-06-141-0/+46
* am: refresh the index at startPaul Tan2015-06-141-0/+20
* am: commit applied patchPaul Tan2015-06-141-4/+46
* am: apply patch with git-applyPaul Tan2015-06-141-1/+54
* am: extract patch, message and authorship with git-mailinfoPaul Tan2015-06-141-0/+228
* am: detect mbox patchesPaul Tan2015-06-141-0/+98
* am: split out mbox/maildir patches with git-mailsplitPaul Tan2015-06-141-4/+103
* am: implement patch queue mechanismPaul Tan2015-06-141-0/+164
* am: implement skeletal builtin amPaul Tan2015-06-144-0/+23
* wrapper: implement xfopen()Paul Tan2015-06-142-0/+19
* wrapper: implement xopen()Paul Tan2015-06-142-0/+26
* Merge branch 'mt/p4-depotFile-at-version'Junio C Hamano2015-06-111-1/+1
|\
| * p4: retrieve the right revision of the file in UTF-16 codepathmt/p4-depotFile-at-versionMiguel Torroja2015-05-271-1/+1
* | Merge branch 'mh/verify-lock-error-report'Junio C Hamano2015-06-112-21/+33
|\ \
| * | ref_transaction_commit(): do not capitalize error messagesmh/verify-lock-error-reportMichael Haggerty2015-05-272-9/+9
| * | verify_lock(): do not capitalize error messagesMichael Haggerty2015-05-271-2/+2
| * | verify_lock(): report errors via a strbufMichael Haggerty2015-05-271-7/+12
| * | verify_lock(): on errors, let the caller unlock the lockMichael Haggerty2015-05-271-4/+4
| * | verify_lock(): return 0/-1 rather than struct ref_lock *Michael Haggerty2015-05-271-7/+14
* | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-115-23/+24
|\ \ \
| * | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-contextJeff King2015-05-274-20/+20
| * | | diff: accept color.diff.context as a synonym for "plain"Jeff King2015-05-272-2/+3
* | | | Merge branch 'jk/clone-dissociate'Junio C Hamano2015-06-111-13/+4
|\ \ \ \
| * | | | clone: reorder --dissociate and --reference optionsjk/clone-dissociateJeff King2015-05-271-2/+2
| * | | | clone: use OPT_STRING_LIST for --referenceJeff King2015-05-271-11/+2
* | | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-114-260/+385
|\ \ \ \ \
| * | | | | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-264-16/+179
| * | | | | diff.c: add emit_del_line() and emit_context_line()Junio C Hamano2015-05-261-12/+38
| * | | | | t4015: separate common setup and per-test expectationJunio C Hamano2015-05-261-12/+13
| * | | | | t4015: modernise styleJunio C Hamano2015-05-261-238/+173
| | |/ / / | |/| | |
* | | | | Sync with 2.4.3Junio C Hamano2015-06-052-1/+78
|\ \ \ \ \
| * | | | | Git 2.4.3v2.4.3Junio C Hamano2015-06-054-3/+80
| * | | | | Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-051-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-058-35/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano2015-06-053-9/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano2015-06-051-4/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/rerere-forget-check-enabled' into maintJunio C Hamano2015-06-051-0/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-log-n' into maintJunio C Hamano2015-06-052-2/+19
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-053-2/+13
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano2015-06-051-5/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano2015-06-051-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \