Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rev-parse: take prefix into account in --git-common-dirnd/git-common-dir-fix | Nguyễn Thái Ngọc Duy | 2016-02-12 | 1 | -0/+10 |
* | Merge branch 'sh/p4-multi-depot' | Junio C Hamano | 2015-12-28 | 1 | -1/+27 |
|\ | |||||
| * | git-p4: reduce number of server queries for fetchessh/p4-multi-depot | Sam Hocevar | 2015-12-21 | 1 | -1/+1 |
| * | git-p4: failing test case for skipping changes with multiple depots | Luke Diamand | 2015-12-14 | 1 | -1/+27 |
* | | Merge branch 'jk/pending-keep-tag-name' | Junio C Hamano | 2015-12-28 | 1 | -0/+29 |
|\ \ | |||||
| * | | revision.c: propagate tag names from pending arrayjk/pending-keep-tag-name | Jeff King | 2015-12-17 | 1 | -0/+29 |
* | | | Merge branch 'jk/symbolic-ref-maint' | Junio C Hamano | 2015-12-28 | 1 | -0/+22 |
|\ \ \ | |||||
| * | | | t1401: test reflog creation for git-symbolic-refjk/symbolic-ref-maint | Jeff King | 2015-12-21 | 1 | -0/+16 |
| * | | | symbolic-ref: propagate error code from create_symref() | Jeff King | 2015-12-21 | 1 | -0/+6 |
* | | | | Merge branch 'bc/format-patch-null-from-line' | Junio C Hamano | 2015-12-21 | 1 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | format-patch: check that header line has expected formatbc/format-patch-null-from-line | brian m. carlson | 2015-12-15 | 1 | -0/+7 |
| * | | | | format-patch: add an option to suppress commit hash | brian m. carlson | 2015-12-15 | 1 | -0/+7 |
* | | | | | Merge branch 'mc/push-recurse-submodules-config' | Junio C Hamano | 2015-12-21 | 1 | -1/+216 |
|\ \ \ \ \ | |||||
| * | | | | | push: follow the "last one wins" convention for --recurse-submodulesmc/push-recurse-submodules-config | Mike Crowe | 2015-12-04 | 1 | -0/+41 |
| * | | | | | push: test that --recurse-submodules on command line overrides config | Mike Crowe | 2015-12-04 | 1 | -4/+28 |
| * | | | | | push: add recurseSubmodules config option | Mike Crowe | 2015-11-20 | 1 | -1/+151 |
| |/ / / / | |||||
* | | | | | Merge branch 'fr/rebase-i-continue-preserve-options' | Junio C Hamano | 2015-12-16 | 1 | -0/+16 |
|\ \ \ \ \ | |||||
| * | | | | | rebase -i: remember merge options beyond continue actionsfr/rebase-i-continue-preserve-options | Fabian Ruch | 2015-12-11 | 1 | -0/+16 |
| * | | | | | Merge branch 'cb/t3404-shellquote' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint | Junio C Hamano | 2015-12-11 | 4 | -16/+31 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'sg/bash-prompt-dirty-orphan' into maint | Junio C Hamano | 2015-12-08 | 1 | -3/+28 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/rebase-no-autostash' into maint | Junio C Hamano | 2015-12-08 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'da/difftool' into maint | Junio C Hamano | 2015-12-04 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'dk/gc-idx-wo-pack' into maint | Junio C Hamano | 2015-12-04 | 1 | -0/+21 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-keep-empty-commits' | Junio C Hamano | 2015-12-15 | 1 | -0/+134 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | git-p4: add option to keep empty commitsls/p4-keep-empty-commits | Lars Schneider | 2015-12-10 | 1 | -0/+134 |
* | | | | | | | | | | | | Merge branch 'cb/t3404-shellquote' | Junio C Hamano | 2015-12-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquote | Charles Bailey | 2015-12-04 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'ls/test-must-fail-sigpipe' | Junio C Hamano | 2015-12-08 | 3 | -20/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | add "ok=sigpipe" to test_must_fail and use it to fix flaky testsls/test-must-fail-sigpipe | Lars Schneider | 2015-11-28 | 3 | -6/+8 |
| * | | | | | | | | | | | | implement test_might_fail using a refactored test_must_fail | Lars Schneider | 2015-11-28 | 1 | -14/+33 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'sg/bash-prompt-dirty-orphan' | Junio C Hamano | 2015-12-04 | 1 | -3/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | bash prompt: indicate dirty index even on orphan branchessg/bash-prompt-dirty-orphan | SZEDER Gábor | 2015-11-24 | 1 | -2/+2 |
| * | | | | | | | | | | | bash prompt: test dirty index and worktree while on an orphan branch | SZEDER Gábor | 2015-11-24 | 1 | -3/+28 |
* | | | | | | | | | | | | Merge branch 'jk/send-email-complete-aliases' | Junio C Hamano | 2015-12-04 | 1 | -0/+82 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | sendemail: teach git-send-email to dump alias names | Jacob Keller | 2015-11-20 | 1 | -0/+82 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/filter-branch-no-index' | Junio C Hamano | 2015-12-04 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | filter-branch: skip index read/write when possible | Jeff King | 2015-11-06 | 1 | -0/+19 |
* | | | | | | | | | | | | | Merge branch 'mk/blame-first-parent' | Jeff King | 2015-12-01 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | blame: fix object casting regression | Jeff King | 2015-11-24 | 1 | -0/+7 |
* | | | | | | | | | | | | | | Merge branch 'rs/fsck-nul-header' | Jeff King | 2015-12-01 | 1 | -0/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | fsck: treat a NUL in a tag header as an error | René Scharfe | 2015-11-20 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | t1450: add tests for NUL in headers of commits and tags | René Scharfe | 2015-11-20 | 1 | -0/+32 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'ls/p4-test-timeouts' | Jeff King | 2015-12-01 | 1 | -9/+62 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | git-p4: add trap to kill p4d on test exit | Lars Schneider | 2015-11-20 | 1 | -0/+9 |
| * | | | | | | | | | | | | | | git-p4: add p4d timeout in tests | Lars Schneider | 2015-11-20 | 1 | -1/+19 |
| * | | | | | | | | | | | | | | git-p4: retry kill/cleanup operations in tests with timeout | Lars Schneider | 2015-11-20 | 1 | -8/+34 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'js/test-modernize-t9300' | Jeff King | 2015-12-01 | 1 | -1783/+1798 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | modernize t9300: move test preparations into test_expect_success | Johannes Sixt | 2015-11-20 | 1 | -1250/+1264 |
| * | | | | | | | | | | | | | | modernize t9300: mark here-doc words to ignore tab indentation | Johannes Sixt | 2015-11-20 | 1 | -100/+100 |