Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | t5001: add tests for export-ignore attributes and exclude pathspecs | René Scharfe | 2017-08-19 | 1 | -3/+44 | |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'mg/killed-merge' into maint | Junio C Hamano | 2017-09-10 | 3 | -4/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | merge: save merge state earliermg/killed-merge | Michael J Gruber | 2017-08-23 | 2 | -0/+17 | |
| * | | | | | | | | | | | | | merge: split write_merge_state in two | Michael J Gruber | 2017-08-23 | 1 | -3/+8 | |
| * | | | | | | | | | | | | | merge: clarify call chain | Michael J Gruber | 2017-08-23 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | Documentation/git-merge: explain --continue | Michael J Gruber | 2017-08-21 | 1 | -1/+4 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'tb/apply-with-crlf' into maint | Junio C Hamano | 2017-09-10 | 4 | -16/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | apply: file commited with CRLF should roundtrip diff and applytb/apply-with-crlf | Torsten Bögershausen | 2017-08-19 | 2 | -11/+63 | |
| * | | | | | | | | | | | | | convert: add SAFE_CRLF_KEEP_CRLF | Torsten Bögershausen | 2017-08-16 | 2 | -5/+8 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint | Junio C Hamano | 2017-09-10 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | sub-process: print the cmd when a capability is unsupported | Christian Couder | 2017-08-16 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maint | Junio C Hamano | 2017-09-10 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | git-grep: correct exit code with --quiet and -Las/grep-quiet-no-match-exit-code-fix | Anthony Sottile | 2017-08-17 | 2 | -1/+6 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'kd/stash-with-bash-4.4' into maint | Junio C Hamano | 2017-09-10 | 1 | -2/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | stash: prevent warning about null bytes in inputkd/stash-with-bash-4.4 | Kevin Daudt | 2017-08-14 | 1 | -2/+9 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'rs/win32-syslog-leakfix' into maint | Junio C Hamano | 2017-09-10 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | win32: plug memory leak on realloc() failure in syslog()rs/win32-syslog-leakfix | René Scharfe | 2017-08-10 | 1 | -0/+2 | |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'rs/unpack-entry-leakfix' into maint | Junio C Hamano | 2017-09-10 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | sha1_file: release delta_stack on error in unpack_entry()rs/unpack-entry-leakfix | René Scharfe | 2017-08-10 | 1 | -2/+3 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'rs/fsck-obj-leakfix' into maint | Junio C Hamano | 2017-09-10 | 1 | -11/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | fsck: free buffers on error in fsck_obj()rs/fsck-obj-leakfix | René Scharfe | 2017-08-10 | 1 | -11/+11 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'ur/svn-local-zone' into maint | Junio C Hamano | 2017-09-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | git svn fetch: Create correct commit timestamp when using --localtimeur/svn-local-zone | Urs Thuermann | 2017-08-08 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'pw/am-signoff' into maint | Junio C Hamano | 2017-09-10 | 2 | -45/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | am: fix signoff when other trailers are presentpw/am-signoff | Phillip Wood | 2017-08-08 | 2 | -45/+64 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'rs/in-obsd-basename-dirname-take-const' into maint | Junio C Hamano | 2017-09-10 | 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/t4062-obsd' into maint | Junio C Hamano | 2017-09-10 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t4062: use less than 256 repetitions in regexrs/t4062-obsd | René Scharfe | 2017-08-09 | 1 | -1/+3 | |
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'rs/obsd-getcwd-workaround' into maint | Junio C Hamano | 2017-09-10 | 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 'bw/clone-recursive-quiet' into maint | Junio C Hamano | 2017-09-10 | 2 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | clone: teach recursive clones to respect -qbw/clone-recursive-quiet | Brandon Williams | 2017-08-04 | 2 | -0/+9 | |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'pw/sequence-rerere-autoupdate' into maint | Junio C Hamano | 2017-09-10 | 7 | -50/+171 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdate | Phillip Wood | 2017-08-02 | 2 | -0/+15 | |
| * | | | | | | | | | | | | | | | | | cherry-pick/revert: remember --rerere-autoupdate | Phillip Wood | 2017-08-02 | 2 | -8/+62 | |
| * | | | | | | | | | | | | | | | | | t3504: use test_commit | Phillip Wood | 2017-08-02 | 1 | -12/+9 | |
| * | | | | | | | | | | | | | | | | | rebase -i: honor --rerere-autoupdate | Phillip Wood | 2017-08-02 | 3 | -3/+17 | |
| * | | | | | | | | | | | | | | | | | rebase: honor --rerere-autoupdate | Phillip Wood | 2017-08-02 | 2 | -28/+57 | |
| * | | | | | | | | | | | | | | | | | am: remember --rerere-autoupdate setting | Phillip Wood | 2017-08-02 | 1 | -0/+12 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maint | Junio C Hamano | 2017-09-10 | 3 | -13/+79 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodules | Brandon Williams | 2017-07-20 | 3 | -13/+79 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maint | Junio C Hamano | 2017-09-10 | 6 | -76/+201 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | git.c: ignore pager.* when launching builtin as dashed externalma/pager-per-subcommand-action | Martin Ågren | 2017-08-03 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | tag: change default of `pager.tag` to "on" | Martin Ågren | 2017-08-03 | 3 | -16/+16 | |
| * | | | | | | | | | | | | | | | | | | | tag: respect `pager.tag` in list-mode only | Martin Ågren | 2017-08-03 | 4 | -2/+21 | |
| * | | | | | | | | | | | | | | | | | | | t7006: add tests for how git tag paginates | Martin Ågren | 2017-08-03 | 1 | -0/+67 | |
| * | | | | | | | | | | | | | | | | | | | git.c: provide setup_auto_pager() | Martin Ågren | 2017-08-03 | 2 | -0/+22 | |
| * | | | | | | | | | | | | | | | | | | | git.c: let builtins opt for handling `pager.foo` themselves | Martin Ågren | 2017-08-03 | 2 | -1/+11 | |
| * | | | | | | | | | | | | | | | | | | | builtin.h: take over documentation from api-builtin.txt | Martin Ågren | 2017-08-03 | 2 | -73/+80 | |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |