Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dt/reflog-tests' | Junio C Hamano | 2015-08-12 | 11 | -46/+37 |
|\ | |||||
| * | tests: remove some direct access to .git/logsdt/reflog-tests | David Turner | 2015-07-28 | 10 | -33/+37 |
| * | t/t7509: remove unnecessary manipulation of reflog | David Turner | 2015-07-28 | 1 | -13/+0 |
| * | Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maint | Junio C Hamano | 2015-07-27 | 1 | -0/+6 |
| |\ | |||||
| * \ | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maint | Junio C Hamano | 2015-07-27 | 1 | -52/+47 |
| |\ \ | |||||
* | \ \ | Merge branch 'es/worktree-add-cleanup' | Junio C Hamano | 2015-08-12 | 1 | -0/+34 |
|\ \ \ \ | |||||
| * | | | | worktree: add: suppress auto-vivication with --detach and no <branch> | Eric Sunshine | 2015-07-20 | 1 | -0/+14 |
| * | | | | worktree: make --detach mutually exclusive with -b/-B | Eric Sunshine | 2015-07-20 | 1 | -0/+12 |
| * | | | | checkout: teach check_linked_checkout() about symbolic link HEAD | Eric Sunshine | 2015-07-20 | 1 | -0/+8 |
* | | | | | Merge branch 'pt/am-builtin' | Junio C Hamano | 2015-08-12 | 1 | -0/+19 |
|\ \ \ \ \ | |||||
| * | | | | | git-am: add am.threeWay config variable | Remi Lespinet | 2015-08-04 | 1 | -0/+19 |
* | | | | | | Merge branch 'ad/bisect-cleanup' | Junio C Hamano | 2015-08-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | bisect: correction of typo | Antoine Delaite | 2015-06-23 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/refspec-parse-wildcard' | Junio C Hamano | 2015-08-03 | 2 | -7/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | refs: loosen restriction on wildcard "*" refspecsjk/refspec-parse-wildcard | Jacob Keller | 2015-07-27 | 2 | -7/+12 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'zb/userdiff-fountain' | Junio C Hamano | 2015-08-03 | 2 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | userdiff: add support for Fountain documentszb/userdiff-fountain | Zoë Blade | 2015-07-23 | 2 | -0/+5 |
* | | | | | | | | Merge branch 'dt/refs-backend-preamble' | Junio C Hamano | 2015-08-03 | 3 | -1/+56 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | update-ref and tag: add --create-reflog arg | David Turner | 2015-07-21 | 2 | -1/+51 |
| * | | | | | | | | git-reflog: add exists command | David Turner | 2015-07-21 | 1 | -0/+5 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'as/sparse-checkout-removal' | Junio C Hamano | 2015-08-03 | 1 | -0/+52 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removal | David Turner | 2015-07-21 | 1 | -0/+52 |
* | | | | | | | | Merge branch 'jk/date-mode-format' | Junio C Hamano | 2015-08-03 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | strbuf: make strbuf_addftime more robustjk/date-mode-format | Jeff King | 2015-07-20 | 1 | -0/+10 |
| * | | | | | | | | introduce "format" date-mode | Jeff King | 2015-06-29 | 1 | -0/+8 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pt/am-tests' | Junio C Hamano | 2015-08-03 | 4 | -0/+313 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3901: test git-am encoding conversionpt/am-tests | Paul Tan | 2015-07-20 | 1 | -0/+62 |
| * | | | | | | | | t3418: non-interactive rebase --continue with rerere enabled | Paul Tan | 2015-07-20 | 1 | -0/+19 |
| * | | | | | | | | t4150: tests for am --[no-]scissors | Paul Tan | 2015-07-20 | 1 | -0/+48 |
| * | | | | | | | | t4150: am with post-applypatch hook | Paul Tan | 2015-07-20 | 1 | -0/+38 |
| * | | | | | | | | t4150: am with pre-applypatch hook | Paul Tan | 2015-07-20 | 1 | -0/+33 |
| * | | | | | | | | t4150: am with applypatch-msg hook | Paul Tan | 2015-07-20 | 1 | -0/+35 |
| * | | | | | | | | t4150: am --resolved fails if index has unmerged entries | Paul Tan | 2015-07-20 | 1 | -0/+13 |
| * | | | | | | | | t4150: am --resolved fails if index has no changes | Paul Tan | 2015-07-20 | 1 | -0/+12 |
| * | | | | | | | | t4150: am refuses patches when paused | Paul Tan | 2015-07-20 | 1 | -0/+14 |
| * | | | | | | | | t4151: am --abort will keep dirty index intact | Paul Tan | 2015-07-20 | 1 | -0/+15 |
| * | | | | | | | | t4150: am fails if index is dirty | Paul Tan | 2015-07-20 | 1 | -0/+12 |
| * | | | | | | | | t4150: am.messageid really adds the message id | Paul Tan | 2015-07-07 | 1 | -0/+12 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'sg/bash-prompt-untracked-optim' | Junio C Hamano | 2015-08-03 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | bash prompt: test untracked files status indicator with untracked dirs | SZEDER Gábor | 2015-07-20 | 1 | -0/+25 |
| | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'pt/t0302-needs-sanity' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint | Junio C Hamano | 2015-07-15 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'ib/scripted-parse-opt-better-hint-string' | Junio C Hamano | 2015-08-03 | 1 | -39/+60 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-string | Ilya Bobyr | 2015-07-15 | 1 | -39/+60 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'mh/fast-import-get-mark' | Junio C Hamano | 2015-08-03 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fast-import: add a get-mark commandmh/fast-import-get-mark | Michael Haggerty | 2015-07-01 | 1 | -0/+13 |
* | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-08-03 | 2 | -2/+130 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git rebase -i: add static check for commands and SHA-1 | Galan Rémi | 2015-06-30 | 2 | -0/+44 |
| * | | | | | | | | | | | git rebase -i: warn about removed commits | Galan Rémi | 2015-06-30 | 1 | -0/+66 |
| * | | | | | | | | | | | git-rebase -i: add command "drop" to remove a commit | Galan Rémi | 2015-06-30 | 2 | -2/+20 |