aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* builtin-am: pass git-apply's options to git-applyPaul Tan2015-08-04
* builtin-am: implement --[no-]scissorsPaul Tan2015-08-04
* builtin-am: support --keep-cr, am.keepcrPaul Tan2015-08-04
* builtin-am: implement --[no-]message-id, am.messageidPaul Tan2015-08-04
* builtin-am: implement -k/--keep, --keep-non-patchPaul Tan2015-08-04
* builtin-am: implement -u/--utf8Paul Tan2015-08-04
* builtin-am: handle stray state directoryPaul Tan2015-08-04
* builtin-am: bypass git-mailinfo when --rebasingPaul Tan2015-08-04
* builtin-am: implement --rebasing modePaul Tan2015-08-04
* builtin-am: implement --3wayPaul Tan2015-08-04
* cache-tree: introduce write_index_as_tree()Paul Tan2015-08-04
* builtin-am: implement -s/--signoffPaul Tan2015-08-04
* builtin-am: exit with user friendly message on failurePaul Tan2015-08-04
* builtin-am: implement -q/--quietPaul Tan2015-08-04
* builtin-am: reject patches when there's a session in progressPaul Tan2015-08-04
* builtin-am: implement --abortPaul Tan2015-08-04
* builtin-am: implement --skipPaul Tan2015-08-04
* builtin-am: don't parse mail when resumingPaul Tan2015-08-04
* builtin-am: implement --resolved/--continuePaul Tan2015-08-04
* builtin-am: refuse to apply patches if index is dirtyPaul Tan2015-08-04
* builtin-am: implement committing applied patchPaul Tan2015-08-04
* builtin-am: apply patch with git-applyPaul Tan2015-08-04
* builtin-am: extract patch and commit info with git-mailinfoPaul Tan2015-08-04
* builtin-am: auto-detect mbox patchesPaul Tan2015-08-04
* builtin-am: split out mbox/maildir patches with git-mailsplitPaul Tan2015-08-04
* builtin-am: implement patch queue mechanismPaul Tan2015-08-04
* builtin-am: implement skeletal builtin amPaul Tan2015-08-04
* wrapper: implement xfopen()Paul Tan2015-08-04
* wrapper: implement xopen()Paul Tan2015-08-04
* Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-03
|\
| * strbuf: make strbuf_addftime more robustJeff King2015-07-20
| * introduce "format" date-modeJeff King2015-06-29
| * convert "enum date_mode" into a structJeff King2015-06-29
| * show-branch: use DATE_RELATIVE instead of magic numberJeff King2015-06-29
* | Merge branch 'pt/am-tests'Junio C Hamano2015-08-03
|\ \
| * | t3901: test git-am encoding conversionPaul Tan2015-07-20
| * | t3418: non-interactive rebase --continue with rerere enabledPaul Tan2015-07-20
| * | t4150: tests for am --[no-]scissorsPaul Tan2015-07-20
| * | t4150: am with post-applypatch hookPaul Tan2015-07-20
| * | t4150: am with pre-applypatch hookPaul Tan2015-07-20
| * | t4150: am with applypatch-msg hookPaul Tan2015-07-20
| * | t4150: am --resolved fails if index has unmerged entriesPaul Tan2015-07-20
| * | t4150: am --resolved fails if index has no changesPaul Tan2015-07-20
| * | t4150: am refuses patches when pausedPaul Tan2015-07-20
| * | t4151: am --abort will keep dirty index intactPaul Tan2015-07-20
| * | t4150: am fails if index is dirtyPaul Tan2015-07-20
| * | t4150: am.messageid really adds the message idPaul Tan2015-07-07
* | | Merge branch 'sg/bash-prompt-untracked-optim'Junio C Hamano2015-08-03
|\ \ \
| * | | bash prompt: faster untracked status indicator with untracked directoriesSZEDER Gábor2015-07-20
| * | | bash prompt: test untracked files status indicator with untracked dirsSZEDER Gábor2015-07-20