summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* branch: record creation of renamed branch in HEAD's logkm/delete-ref-reflog-messageKyle Meyer2017-02-206-10/+15
* rename_ref: replace empty message in HEAD's logKyle Meyer2017-02-202-1/+6
* update-ref: pass reflog message to delete_ref()Kyle Meyer2017-02-202-1/+19
* delete_ref: accept a reflog message argumentKyle Meyer2017-02-2014-22/+22
* Git 2.12-rc2v2.12.0-rc2Junio C Hamano2017-02-171-1/+1
* Hopefully the final batch of mini-topics before the finalJunio C Hamano2017-02-161-0/+18
* Merge branch 'jk/tempfile-ferror-fclose-confusion'Junio C Hamano2017-02-161-6/+2
|\
| * tempfile: avoid "ferror | fclose" trickJeff King2017-02-161-6/+2
* | Merge branch 'dp/submodule-doc-markup-fix'Junio C Hamano2017-02-161-1/+1
|\ \
| * | config.txt: fix formatting of submodule.alternateErrorStrategy sectiondp/submodule-doc-markup-fixDavid Pursehouse2017-02-161-1/+1
* | | Merge branch 'jk/reset-to-break-a-commit-doc-updated'Junio C Hamano2017-02-161-0/+48
|\ \ \
| * | | reset: add an example of how to split a commit into twojk/reset-to-break-a-commit-doc-updatedJacob Keller2017-02-161-0/+48
* | | | Merge branch 'jk/reset-to-break-a-commit-doc'Junio C Hamano2017-02-161-38/+0
|\ \ \ \ | |/ / /
| * | | Revert "reset: add an example of how to split a commit into two"jk/reset-to-break-a-commit-docJunio C Hamano2017-02-161-38/+0
* | | | Merge branch 'js/mingw-isatty'Junio C Hamano2017-02-161-0/+4
|\ \ \ \
| * | | | mingw: make stderr unbuffered againjs/mingw-isattyJohannes Schindelin2017-02-141-0/+4
* | | | | Merge branch 'rs/strbuf-cleanup-in-rmdir-recursively'Junio C Hamano2017-02-161-3/+3
|\ \ \ \ \
| * | | | | rm: reuse strbuf for all remove_dir_recursively() calls, againrs/strbuf-cleanup-in-rmdir-recursivelyRené Scharfe2017-02-131-3/+3
* | | | | | Merge branch 'rs/ls-files-partial-optim'Junio C Hamano2017-02-161-10/+11
|\ \ \ \ \ \
| * | | | | | ls-files: move only kept cache entries in prune_cache()rs/ls-files-partial-optimRené Scharfe2017-02-131-5/+4
| * | | | | | ls-files: pass prefix length explicitly to prune_cache()René Scharfe2017-02-131-5/+7
* | | | | | | Merge branch 'rs/cocci-check-free-only-null'Junio C Hamano2017-02-161-0/+6
|\ \ \ \ \ \ \
| * | | | | | | cocci: detect useless free(3) callsrs/cocci-check-free-only-nullRené Scharfe2017-02-111-0/+6
| |/ / / / / /
* | | | | | | Merge branch 'ls/p4-path-encoding'Junio C Hamano2017-02-162-10/+30
|\ \ \ \ \ \ \
| * | | | | | | git-p4: fix git-p4.pathEncoding for removed filesls/p4-path-encodingLars Schneider2017-02-102-10/+30
* | | | | | | | A bit more for -rc2Junio C Hamano2017-02-151-0/+15
* | | | | | | | Merge branch 'tg/stash-doc-cleanup'Junio C Hamano2017-02-151-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/stash: remove mention of git reset --hardtg/stash-doc-cleanupThomas Gummerer2017-02-131-2/+3
* | | | | | | | | Merge branch 'jk/doc-submodule-markup-fix'Junio C Hamano2017-02-151-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs/git-submodule: fix unbalanced quotejk/doc-submodule-markup-fixJeff King2017-02-131-3/+6
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/doc-remote-helpers-markup-fix'Junio C Hamano2017-02-151-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs/gitremote-helpers: fix unbalanced quotesjk/doc-remote-helpers-markup-fixJeff King2017-02-131-3/+3
* | | | | | | | | | Merge branch 'sb/doc-unify-bottom'Junio C Hamano2017-02-158-8/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: unify bottom "part of git suite" linessb/doc-unify-bottomStefan Beller2017-02-098-8/+8
* | | | | | | | | | | Merge branch 'sb/push-options-via-transport'Junio C Hamano2017-02-153-0/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | push options: pass push options to the transport helperStefan Beller2017-02-083-0/+26
* | | | | | | | | | | | Merge branch 'cw/completion'Junio C Hamano2017-02-151-21/+118
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | completion: recognize more long-optionscw/completionCornelius Weig2017-02-031-9/+20
| * | | | | | | | | | | | completion: teach remote subcommands to complete optionsCornelius Weig2017-02-031-7/+38
| * | | | | | | | | | | | completion: teach replace to complete optionsCornelius Weig2017-02-031-0/+6
| * | | | | | | | | | | | completion: teach ls-remote to complete optionsCornelius Weig2017-02-031-0/+6
| * | | | | | | | | | | | completion: improve bash completion for git-addCornelius Weig2017-02-031-3/+7
| * | | | | | | | | | | | completion: add subcommand completion for rerereCornelius Weig2017-02-031-0/+11
| * | | | | | | | | | | | completion: teach submodule subcommands to complete optionsCornelius Weig2017-02-031-2/+30
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rs/swap'Junio C Hamano2017-02-1514-65/+63
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | graph: use SWAP macrors/swapRené Scharfe2017-01-301-5/+1
| * | | | | | | | | | | | diff: use SWAP macroRené Scharfe2017-01-302-5/+2
| * | | | | | | | | | | | use SWAP macroRené Scharfe2017-01-3011-39/+15
| * | | | | | | | | | | | apply: use SWAP macroRené Scharfe2017-01-301-16/+7
| * | | | | | | | | | | | add SWAP macroRené Scharfe2017-01-302-0/+38