aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | Merge branch 'rs/archive-excluded-directory' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | archive: don't queue excluded directoriesRené Scharfe2017-08-19
| * | | | | | | | | | | | | archive: factor out helper functions for handling attributesRené Scharfe2017-08-19
| * | | | | | | | | | | | | t5001: add tests for export-ignore attributes and exclude pathspecsRené Scharfe2017-08-19
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mg/killed-merge' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: save merge state earlierMichael J Gruber2017-08-23
| * | | | | | | | | | | | | merge: split write_merge_state in twoMichael J Gruber2017-08-23
| * | | | | | | | | | | | | merge: clarify call chainMichael J Gruber2017-08-23
| * | | | | | | | | | | | | Documentation/git-merge: explain --continueMichael J Gruber2017-08-21
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'tb/apply-with-crlf' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | apply: file commited with CRLF should roundtrip diff and applyTorsten Bögershausen2017-08-19
| * | | | | | | | | | | | | convert: add SAFE_CRLF_KEEP_CRLFTorsten Bögershausen2017-08-16
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'cc/subprocess-handshake-missing-capabilities' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sub-process: print the cmd when a capability is unsupportedChristian Couder2017-08-16
* | | | | | | | | | | | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-grep: correct exit code with --quiet and -LAnthony Sottile2017-08-17
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'kd/stash-with-bash-4.4' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | stash: prevent warning about null bytes in inputKevin Daudt2017-08-14
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs/win32-syslog-leakfix' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | win32: plug memory leak on realloc() failure in syslog()René Scharfe2017-08-10
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs/unpack-entry-leakfix' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | sha1_file: release delta_stack on error in unpack_entry()René Scharfe2017-08-10
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs/fsck-obj-leakfix' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fsck: free buffers on error in fsck_obj()René Scharfe2017-08-10
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ur/svn-local-zone' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git svn fetch: Create correct commit timestamp when using --localtimeUrs Thuermann2017-08-08
* | | | | | | | | | | | | | | Merge branch 'pw/am-signoff' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | am: fix signoff when other trailers are presentPhillip Wood2017-08-08
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'rs/in-obsd-basename-dirname-take-const' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | test-path-utils: handle const parameter of basename and dirnameRené Scharfe2017-08-07
* | | | | | | | | | | | | | | | Merge branch 'rs/t4062-obsd' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t4062: use less than 256 repetitions in regexRené Scharfe2017-08-09
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rs/obsd-getcwd-workaround' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t0001: skip test with restrictive permissions if getpwd(3) respects themRené Scharfe2017-08-07
* | | | | | | | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | clone: teach recursive clones to respect -qBrandon Williams2017-08-04
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'pw/sequence-rerere-autoupdate' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingPhillip Wood2017-08-02
| * | | | | | | | | | | | | | | | | cherry-pick/revert: remember --rerere-autoupdatePhillip Wood2017-08-02
| * | | | | | | | | | | | | | | | | t3504: use test_commitPhillip Wood2017-08-02
| * | | | | | | | | | | | | | | | | rebase -i: honor --rerere-autoupdatePhillip Wood2017-08-02
| * | | | | | | | | | | | | | | | | rebase: honor --rerere-autoupdatePhillip Wood2017-08-02
| * | | | | | | | | | | | | | | | | am: remember --rerere-autoupdate settingPhillip Wood2017-08-02
* | | | | | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | submodule--helper: teach push-check to handle HEADBrandon Williams2017-07-20
* | | | | | | | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git.c: ignore pager.* when launching builtin as dashed externalMartin Ågren2017-08-03
| * | | | | | | | | | | | | | | | | | | tag: change default of `pager.tag` to "on"Martin Ågren2017-08-03
| * | | | | | | | | | | | | | | | | | | tag: respect `pager.tag` in list-mode onlyMartin Ågren2017-08-03
| * | | | | | | | | | | | | | | | | | | t7006: add tests for how git tag paginatesMartin Ågren2017-08-03