summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'rs/merge-microcleanup' into maintJunio C Hamano2017-09-101-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: use skip_prefix()rs/merge-microcleanupRené Scharfe2017-08-101-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'rs/find-pack-entry-bisection' into maintJunio C Hamano2017-09-101-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1_file: avoid comparison if no packed hash matches the first byters/find-pack-entry-bisectionRené Scharfe2017-08-091-2/+2
* | | | | | | | | Merge branch 'rs/apply-lose-prefix-length' into maintJunio C Hamano2017-09-102-8/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply: remove prefix_length member from apply_staters/apply-lose-prefix-lengthRené Scharfe2017-08-092-8/+5
* | | | | | | | | | Merge branch 'rj/add-chmod-error-message' into maintJunio C Hamano2017-09-101-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/add: add detail to a 'cannot chmod' error messagerj/add-chmod-error-messageRamsay Jones2017-08-091-3/+3
* | | | | | | | | | | Merge branch 'jk/hashcmp-memcmp' into maintJunio C Hamano2017-09-101-8/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | hashcmp: use memcmp instead of open-coded loopjk/hashcmp-memcmpJeff King2017-08-091-8/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs/t3700-clean-leftover' into maintJunio C Hamano2017-09-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t3700: fix broken test under !POSIXPERMrs/t3700-clean-leftoverRené Scharfe2017-08-081-0/+1
* | | | | | | | | | | | Merge branch 'jc/perl-git-comment-typofix' into maintJunio C Hamano2017-09-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | perl/Git.pm: typofix in a commentjc/perl-git-comment-typofixJunio C Hamano2017-08-071-1/+1
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mf/no-dashed-subcommands' into maintJunio C Hamano2017-09-105-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | scripts: use "git foo" not "git-foo"mf/no-dashed-subcommandsMichael Forney2017-08-075-10/+10
* | | | | | | | | | | | | Merge branch 'ab/ref-filter-no-contains' into maintJunio C Hamano2017-09-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tests: don't give unportable ">" to "test" built-in, use -gtab/ref-filter-no-containsÆvar Arnfjörð Bjarmason2017-08-071-1/+1
* | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |