Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | revision.c: --indexed-objects add objects from all worktrees | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -0/+9 |
* | Merge branch 'lg/merge-signoff' | Junio C Hamano | 2017-08-24 | 1 | -0/+69 |
|\ | |||||
| * | merge: add a --signoff flaglg/merge-signoff | Łukasz Gryglicki | 2017-07-25 | 1 | -0/+69 |
* | | Merge branch 'hv/t5526-andand-chain-fix' | Junio C Hamano | 2017-08-23 | 1 | -4/+4 |
|\ \ | |||||
| * | | t5526: fix some broken && chainshv/t5526-andand-chain-fix | Heiko Voigt | 2017-08-17 | 1 | -4/+4 |
* | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix' | Junio C Hamano | 2017-08-23 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | git-grep: correct exit code with --quiet and -Las/grep-quiet-no-match-exit-code-fix | Anthony Sottile | 2017-08-17 | 1 | -0/+5 |
| |/ / | |||||
* | | | Merge branch 'rs/t1002-do-not-use-sum' | Junio C Hamano | 2017-08-23 | 2 | -35/+35 |
|\ \ \ | |||||
| * | | | t1002: stop using sum(1)rs/t1002-do-not-use-sum | René Scharfe | 2017-08-15 | 2 | -35/+35 |
* | | | | Merge branch 'nm/stash-untracked' | Junio C Hamano | 2017-08-23 | 1 | -0/+17 |
|\ \ \ \ | |||||
| * | | | | stash: clean untracked files before resetnm/stash-untracked | Nicolas Morey-Chaisemartin | 2017-08-11 | 1 | -0/+17 |
* | | | | | Merge branch 'mh/packed-ref-store' | Junio C Hamano | 2017-08-22 | 2 | -0/+84 |
|\ \ \ \ \ | |||||
| * | | | | | packed_ref_store: handle a packed-refs file that is a symlink | Michael Haggerty | 2017-07-27 | 1 | -0/+15 |
| * | | | | | read_packed_refs(): die if `packed-refs` contains bogus data | Michael Haggerty | 2017-07-03 | 1 | -3/+3 |
| * | | | | | t3210: add some tests of bogus packed-refs file contents | Michael Haggerty | 2017-07-03 | 1 | -0/+27 |
| * | | | | | t1408: add a test of stale packed refs covered by loose refs | Junio C Hamano | 2017-06-23 | 1 | -0/+42 |
* | | | | | | Merge branch 'sb/retire-t1200' | Junio C Hamano | 2017-08-22 | 1 | -268/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t1200: remove t1200-tutorial.shsb/retire-t1200 | Stefan Beller | 2017-08-10 | 1 | -268/+0 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'rs/t4062-obsd' | Junio C Hamano | 2017-08-22 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t4062: use less than 256 repetitions in regexrs/t4062-obsd | René Scharfe | 2017-08-09 | 1 | -1/+3 |
* | | | | | | | Merge branch 'jk/drop-sha1-entry-pos' | Junio C Hamano | 2017-08-22 | 2 | -11/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sha1_file: drop experimental GIT_USE_LOOKUP search | Jeff King | 2017-08-09 | 2 | -11/+1 |
* | | | | | | | | Merge branch 'pw/am-signoff' | Junio C Hamano | 2017-08-22 | 1 | -20/+63 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | am: fix signoff when other trailers are presentpw/am-signoff | Phillip Wood | 2017-08-08 | 1 | -20/+63 |
* | | | | | | | | | Merge branch 'rs/t3700-clean-leftover' | Junio C Hamano | 2017-08-22 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t3700: fix broken test under !POSIXPERMrs/t3700-clean-leftover | René Scharfe | 2017-08-08 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'rs/in-obsd-basename-dirname-take-const' | Junio C Hamano | 2017-08-22 | 1 | -2/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | test-path-utils: handle const parameter of basename and dirnamers/in-obsd-basename-dirname-take-const | René Scharfe | 2017-08-07 | 1 | -2/+16 |
* | | | | | | | | | | | Merge branch 'rs/obsd-getcwd-workaround' | Junio C Hamano | 2017-08-22 | 1 | -2/+28 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t0001: skip test with restrictive permissions if getpwd(3) respects themrs/obsd-getcwd-workaround | René Scharfe | 2017-08-07 | 1 | -2/+28 |
* | | | | | | | | | | | | Merge branch 'ma/parse-maybe-bool' | Junio C Hamano | 2017-08-22 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | config: make git_{config,parse}_maybe_bool equivalent | Martin Ågren | 2017-08-07 | 1 | -1/+1 |
| * | | | | | | | | | | | | t5334: document that git push --signed=1 does not work | Martin Ågren | 2017-08-07 | 1 | -0/+7 |
* | | | | | | | | | | | | | Merge branch 'ab/ref-filter-no-contains' | Junio C Hamano | 2017-08-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | tests: don't give unportable ">" to "test" built-in, use -gtab/ref-filter-no-contains | Ævar Arnfjörð Bjarmason | 2017-08-07 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' | Junio C Hamano | 2017-08-22 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | clone: teach recursive clones to respect -qbw/clone-recursive-quiet | Brandon Williams | 2017-08-04 | 1 | -0/+6 |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'pw/sequence-rerere-autoupdate' | Junio C Hamano | 2017-08-22 | 2 | -45/+132 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -0/+13 |
| * | | | | | | | | | | | | | | cherry-pick/revert: remember --rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -7/+53 |
| * | | | | | | | | | | | | | | t3504: use test_commit | Phillip Wood | 2017-08-02 | 1 | -12/+9 |
| * | | | | | | | | | | | | | | rebase -i: honor --rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | rebase: honor --rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -27/+55 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' | Junio C Hamano | 2017-08-22 | 1 | -1/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodules | Brandon Williams | 2017-07-20 | 1 | -1/+24 |
* | | | | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' | Junio C Hamano | 2017-08-11 | 1 | -0/+80 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | git.c: ignore pager.* when launching builtin as dashed externalma/pager-per-subcommand-action | Martin Ågren | 2017-08-03 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | tag: change default of `pager.tag` to "on" | Martin Ågren | 2017-08-03 | 1 | -14/+14 |
| * | | | | | | | | | | | | | | | tag: respect `pager.tag` in list-mode only | Martin Ågren | 2017-08-03 | 1 | -1/+14 |
| * | | | | | | | | | | | | | | | t7006: add tests for how git tag paginates | Martin Ågren | 2017-08-03 | 1 | -0/+67 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |