summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dt/reflog-tests'Junio C Hamano2015-08-1211-46/+37
|\
| * tests: remove some direct access to .git/logsdt/reflog-testsDavid Turner2015-07-2810-33/+37
| * t/t7509: remove unnecessary manipulation of reflogDavid Turner2015-07-281-13/+0
| * Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2015-07-271-0/+6
| |\
| * \ Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maintJunio C Hamano2015-07-271-52/+47
| |\ \
* | \ \ Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-121-0/+34
|\ \ \ \
| * | | | worktree: add: suppress auto-vivication with --detach and no <branch>Eric Sunshine2015-07-201-0/+14
| * | | | worktree: make --detach mutually exclusive with -b/-BEric Sunshine2015-07-201-0/+12
| * | | | checkout: teach check_linked_checkout() about symbolic link HEADEric Sunshine2015-07-201-0/+8
* | | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-121-0/+19
|\ \ \ \ \
| * | | | | git-am: add am.threeWay config variableRemi Lespinet2015-08-041-0/+19
* | | | | | Merge branch 'ad/bisect-cleanup'Junio C Hamano2015-08-121-1/+1
|\ \ \ \ \ \
| * | | | | | bisect: correction of typoAntoine Delaite2015-06-231-1/+1
* | | | | | | Merge branch 'jk/refspec-parse-wildcard'Junio C Hamano2015-08-032-7/+12
|\ \ \ \ \ \ \
| * | | | | | | refs: loosen restriction on wildcard "*" refspecsjk/refspec-parse-wildcardJacob Keller2015-07-272-7/+12
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'zb/userdiff-fountain'Junio C Hamano2015-08-032-0/+5
|\ \ \ \ \ \ \
| * | | | | | | userdiff: add support for Fountain documentszb/userdiff-fountainZoë Blade2015-07-232-0/+5
* | | | | | | | Merge branch 'dt/refs-backend-preamble'Junio C Hamano2015-08-033-1/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | update-ref and tag: add --create-reflog argDavid Turner2015-07-212-1/+51
| * | | | | | | | git-reflog: add exists commandDavid Turner2015-07-211-0/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'as/sparse-checkout-removal'Junio C Hamano2015-08-031-0/+52
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removalDavid Turner2015-07-211-0/+52
* | | | | | | | Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-031-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | strbuf: make strbuf_addftime more robustjk/date-mode-formatJeff King2015-07-201-0/+10
| * | | | | | | | introduce "format" date-modeJeff King2015-06-291-0/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pt/am-tests'Junio C Hamano2015-08-034-0/+313
|\ \ \ \ \ \ \ \
| * | | | | | | | t3901: test git-am encoding conversionpt/am-testsPaul Tan2015-07-201-0/+62
| * | | | | | | | t3418: non-interactive rebase --continue with rerere enabledPaul Tan2015-07-201-0/+19
| * | | | | | | | t4150: tests for am --[no-]scissorsPaul Tan2015-07-201-0/+48
| * | | | | | | | t4150: am with post-applypatch hookPaul Tan2015-07-201-0/+38
| * | | | | | | | t4150: am with pre-applypatch hookPaul Tan2015-07-201-0/+33
| * | | | | | | | t4150: am with applypatch-msg hookPaul Tan2015-07-201-0/+35
| * | | | | | | | t4150: am --resolved fails if index has unmerged entriesPaul Tan2015-07-201-0/+13
| * | | | | | | | t4150: am --resolved fails if index has no changesPaul Tan2015-07-201-0/+12
| * | | | | | | | t4150: am refuses patches when pausedPaul Tan2015-07-201-0/+14
| * | | | | | | | t4151: am --abort will keep dirty index intactPaul Tan2015-07-201-0/+15
| * | | | | | | | t4150: am fails if index is dirtyPaul Tan2015-07-201-0/+12
| * | | | | | | | t4150: am.messageid really adds the message idPaul Tan2015-07-071-0/+12
| |/ / / / / / /
* | | | | | | | Merge branch 'sg/bash-prompt-untracked-optim'Junio C Hamano2015-08-031-0/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | bash prompt: test untracked files status indicator with untracked dirsSZEDER Gábor2015-07-201-0/+25
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2015-07-151-0/+8
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'ib/scripted-parse-opt-better-hint-string'Junio C Hamano2015-08-031-39/+60
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-stringIlya Bobyr2015-07-151-39/+60
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mh/fast-import-get-mark'Junio C Hamano2015-08-031-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-import: add a get-mark commandmh/fast-import-get-markMichael Haggerty2015-07-011-0/+13
* | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-032-2/+130
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git rebase -i: add static check for commands and SHA-1Galan Rémi2015-06-302-0/+44
| * | | | | | | | | | | git rebase -i: warn about removed commitsGalan Rémi2015-06-301-0/+66
| * | | | | | | | | | | git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-302-2/+20