summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsignjs/git-gui-commit-gpgsignJunio C Hamano2016-09-111-0/+3
|\
| * git-gui: respect commit.gpgsign againJohannes Schindelin2016-09-111-0/+3
* | Prepare for 2.9.4Junio C Hamano2016-09-082-1/+84
* | Merge branch 'hv/doc-commit-reference-style' into maintJunio C Hamano2016-09-081-0/+10
|\ \
| * | SubmittingPatches: use gitk's "Copy commit summary" formathv/doc-commit-reference-styleBeat Bolli2016-08-261-3/+8
| * | SubmittingPatches: document how to reference previous commitsHeiko Voigt2016-08-171-0/+5
* | | Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-09-081-1/+0
|\ \ \
| * | | t1410: remove superfluous 'git reflog' from the 'walk past root' testsg/reflog-past-rootSZEDER Gábor2016-08-151-1/+0
* | | | Merge branch 'rs/mailinfo-lib' into maintJunio C Hamano2016-09-081-7/+2
|\ \ \ \
| * | | | mailinfo: recycle strbuf in check_header()rs/mailinfo-libRené Scharfe2016-08-131-7/+2
* | | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-09-082-4/+2
|\ \ \ \ \
| * | | | | receive-pack: use FLEX_ALLOC_MEM in queue_command()René Scharfe2016-08-131-3/+1
| * | | | | correct FLEXPTR_* example in commentRené Scharfe2016-08-131-1/+1
* | | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano2016-09-083-16/+11
|\ \ \ \ \ \
| * | | | | | use strbuf_add_unique_abbrev() for adding short hashesrs/use-strbuf-add-unique-abbrevRené Scharfe2016-08-063-16/+11
* | | | | | | Merge branch 'rs/merge-recursive-string-list-init' into maintJunio C Hamano2016-09-081-2/+1
|\ \ \ \ \ \ \
| * | | | | | | merge-recursive: use STRING_LIST_INIT_NODUPrs/merge-recursive-string-list-initRené Scharfe2016-08-051-2/+1
| |/ / / / / /
* | | | | | | Merge branch 'rs/merge-add-strategies-simplification' into maintJunio C Hamano2016-09-081-34/+10
|\ \ \ \ \ \ \
| * | | | | | | merge: use string_list_split() in add_strategies()rs/merge-add-strategies-simplificationRené Scharfe2016-08-051-34/+10
| |/ / / / / /
* | | | | | | Merge branch 'ls/packet-line-protocol-doc-fix' into maintJunio C Hamano2016-09-081-3/+3
|\ \ \ \ \ \ \
| * | | | | | | pack-protocol: fix maximum pkt-line sizels/packet-line-protocol-doc-fixLars Schneider2016-08-301-3/+3
* | | | | | | | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maintJunio C Hamano2016-09-086-1/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: ensure temporary file handles are not inherited by child processesbw/mingw-avoid-inheriting-fd-to-lockfileBen Wijen2016-08-236-2/+23
| * | | | | | | | t6026-merge-attr: child processes must not inherit index.lock handlesBen Wijen2016-08-181-0/+13
* | | | | | | | | Merge branch 'dg/document-git-c-in-git-config-doc' into maintJunio C Hamano2016-09-081-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: mention `git -c` in git-config(1)dg/document-git-c-in-git-config-docDavid Glasser2016-08-231-0/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/no-html-bypass-on-windows' into maintJunio C Hamano2016-09-083-52/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "display HTML in default browser using Windows' shell API"js/no-html-bypass-on-windowsJohannes Schindelin2016-08-193-52/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/difftool-command-not-found' into maintJunio C Hamano2016-09-082-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | difftool: always honor fatal error exit codesjk/difftool-command-not-foundJohn Keeping2016-08-152-0/+13
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2016-09-082-1/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-152-1/+25
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rs/pull-signed-tag' into maintJunio C Hamano2016-09-084-12/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: use FLEX_ARRAY in struct merge_remote_descrs/pull-signed-tagRené Scharfe2016-08-132-3/+2
| * | | | | | | | | merge-recursive: fix verbose output for multiple base treesRené Scharfe2016-08-132-4/+19
| * | | | | | | | | commit: factor out set_merge_remote_desc()René Scharfe2016-08-132-7/+14
| * | | | | | | | | commit: use xstrdup() in get_merge_parent()René Scharfe2016-08-131-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'js/test-lint-pathname' into maintJunio C Hamano2016-09-081-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/Makefile: ensure that paths are valid on platforms we carejs/test-lint-pathnameJohannes Schindelin2016-08-161-1/+10
| |/ / / / / / / /
* | | | | | | | | Merge branch 'js/mv-dir-to-new-directory' into maintJunio C Hamano2016-09-081-4/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/`js/mv-dir-to-new-directoryJohannes Schindelin2016-08-081-4/+7
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/import-tars-hardlinks' into maintJunio C Hamano2016-09-081-11/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | import-tars: support hard linksjs/import-tars-hardlinksJohannes Schindelin2016-08-031-11/+20
* | | | | | | | | | Merge branch 'ms/document-pack-window-memory-is-per-thread' into maintJunio C Hamano2016-09-082-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | document git-repack interaction of pack.threads and pack.windowMemoryms/document-pack-window-memory-is-per-threadMichael Stahl2016-08-102-4/+6
* | | | | | | | | | | Merge branch 'jk/push-force-with-lease-creation' into maintJunio C Hamano2016-09-084-7/+46
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5533: make it pass on case-sensitive filesystemsjk/push-force-with-lease-creationJohannes Schindelin2016-08-041-1/+1
| * | | | | | | | | | | push: allow pushing new branches with --force-with-leaseJohn Keeping2016-07-263-5/+15
| * | | | | | | | | | | push: add shorthand for --force-with-lease branch creationJohn Keeping2016-07-263-1/+30
| * | | | | | | | | | | Documentation/git-push: fix placeholder formattingJohn Keeping2016-07-251-1/+1