summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'rs/archive-excluded-directory' into maintJunio C Hamano2017-09-102-11/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | archive: don't queue excluded directoriesRené Scharfe2017-08-192-9/+27
| * | | | | | | | | | | | | archive: factor out helper functions for handling attributesRené Scharfe2017-08-191-8/+23
| * | | | | | | | | | | | | t5001: add tests for export-ignore attributes and exclude pathspecsRené Scharfe2017-08-191-3/+44
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mg/killed-merge' into maintJunio C Hamano2017-09-103-4/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-232-0/+17
| * | | | | | | | | | | | | merge: split write_merge_state in twoMichael J Gruber2017-08-231-3/+8
| * | | | | | | | | | | | | merge: clarify call chainMichael J Gruber2017-08-231-0/+2
| * | | | | | | | | | | | | Documentation/git-merge: explain --continueMichael J Gruber2017-08-211-1/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'tb/apply-with-crlf' into maintJunio C Hamano2017-09-104-16/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | apply: file commited with CRLF should roundtrip diff and applytb/apply-with-crlfTorsten Bögershausen2017-08-192-11/+63
| * | | | | | | | | | | | | convert: add SAFE_CRLF_KEEP_CRLFTorsten Bögershausen2017-08-162-5/+8
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'cc/subprocess-handshake-missing-capabilities' into maintJunio C Hamano2017-09-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sub-process: print the cmd when a capability is unsupportedChristian Couder2017-08-161-2/+2
* | | | | | | | | | | | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maintJunio C Hamano2017-09-102-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-grep: correct exit code with --quiet and -Las/grep-quiet-no-match-exit-code-fixAnthony Sottile2017-08-172-1/+6
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'kd/stash-with-bash-4.4' into maintJunio C Hamano2017-09-101-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | stash: prevent warning about null bytes in inputkd/stash-with-bash-4.4Kevin Daudt2017-08-141-2/+9
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs/win32-syslog-leakfix' into maintJunio C Hamano2017-09-101-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | win32: plug memory leak on realloc() failure in syslog()rs/win32-syslog-leakfixRené Scharfe2017-08-101-0/+2
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs/unpack-entry-leakfix' into maintJunio C Hamano2017-09-101-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | sha1_file: release delta_stack on error in unpack_entry()rs/unpack-entry-leakfixRené Scharfe2017-08-101-2/+3
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs/fsck-obj-leakfix' into maintJunio C Hamano2017-09-101-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fsck: free buffers on error in fsck_obj()rs/fsck-obj-leakfixRené Scharfe2017-08-101-11/+11
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ur/svn-local-zone' into maintJunio C Hamano2017-09-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git svn fetch: Create correct commit timestamp when using --localtimeur/svn-local-zoneUrs Thuermann2017-08-081-1/+1
* | | | | | | | | | | | | | | Merge branch 'pw/am-signoff' into maintJunio C Hamano2017-09-102-45/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | am: fix signoff when other trailers are presentpw/am-signoffPhillip Wood2017-08-082-45/+64
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'rs/in-obsd-basename-dirname-take-const' into maintJunio C Hamano2017-09-101-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | test-path-utils: handle const parameter of basename and dirnamers/in-obsd-basename-dirname-take-constRené Scharfe2017-08-071-2/+16
* | | | | | | | | | | | | | | | Merge branch 'rs/t4062-obsd' into maintJunio C Hamano2017-09-101-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t4062: use less than 256 repetitions in regexrs/t4062-obsdRené Scharfe2017-08-091-1/+3
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rs/obsd-getcwd-workaround' into maintJunio C Hamano2017-09-101-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t0001: skip test with restrictive permissions if getpwd(3) respects themrs/obsd-getcwd-workaroundRené Scharfe2017-08-071-2/+28
* | | | | | | | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' into maintJunio C Hamano2017-09-102-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | clone: teach recursive clones to respect -qbw/clone-recursive-quietBrandon Williams2017-08-042-0/+9
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'pw/sequence-rerere-autoupdate' into maintJunio C Hamano2017-09-107-50/+171
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdatePhillip Wood2017-08-022-0/+15
| * | | | | | | | | | | | | | | | | cherry-pick/revert: remember --rerere-autoupdatePhillip Wood2017-08-022-8/+62
| * | | | | | | | | | | | | | | | | t3504: use test_commitPhillip Wood2017-08-021-12/+9
| * | | | | | | | | | | | | | | | | rebase -i: honor --rerere-autoupdatePhillip Wood2017-08-023-3/+17
| * | | | | | | | | | | | | | | | | rebase: honor --rerere-autoupdatePhillip Wood2017-08-022-28/+57
| * | | | | | | | | | | | | | | | | am: remember --rerere-autoupdate settingPhillip Wood2017-08-021-0/+12
* | | | | | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano2017-09-103-13/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodulesBrandon Williams2017-07-203-13/+79
* | | | | | | | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano2017-09-106-76/+201
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git.c: ignore pager.* when launching builtin as dashed externalma/pager-per-subcommand-actionMartin Ågren2017-08-032-2/+2
| * | | | | | | | | | | | | | | | | | | tag: change default of `pager.tag` to "on"Martin Ågren2017-08-033-16/+16
| * | | | | | | | | | | | | | | | | | | tag: respect `pager.tag` in list-mode onlyMartin Ågren2017-08-034-2/+21
| * | | | | | | | | | | | | | | | | | | t7006: add tests for how git tag paginatesMartin Ågren2017-08-031-0/+67