summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | 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
* | | | | | | | | | | | Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-086-10/+57
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | date: clarify --date=raw descriptionjk/reflog-dateJunio C Hamano2016-07-271-1/+5
| * | | | | | | | | | | | date: add "unix" formatJeff King2016-07-275-1/+19
| * | | | | | | | | | | | date: document and test "raw-local" modeJeff King2016-07-272-2/+6
| * | | | | | | | | | | | doc/pretty-formats: explain shortening of %gdJeff King2016-07-221-3/+6
| * | | | | | | | | | | | doc/pretty-formats: describe index/time formats for %gdJeff King2016-07-221-2/+5
| * | | | | | | | | | | | doc/rev-list-options: explain "-g" output formatsJeff King2016-07-221-4/+19
| * | | | | | | | | | | | doc/rev-list-options: clarify "commit@{Nth}" for "-g" optionJeff King2016-07-221-2/+2
* | | | | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2016-09-0810-90/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano2016-07-124-31/+43
| * | | | | | | | | | | | | convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-067-59/+69
* | | | | | | | | | | | | | Merge branch 'jk/common-main' into maintJunio C Hamano2016-09-0853-153/+126
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'jk/common-main-2.8' into jk/common-mainJunio C Hamano2016-07-0653-150/+123
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | mingw: declare main()'s argv as constjk/common-main-2.8Johannes Schindelin2016-07-062-8/+2
| | * | | | | | | | | | | | common-main: call git_setup_gettext()Jeff King2016-07-0112-22/+2
| | * | | | | | | | | | | | common-main: call restore_sigpipe_to_default()Jeff King2016-07-012-23/+23
| | * | | | | | | | | | | | common-main: call sanitize_stdfds()Jeff King2016-07-014-17/+9
| | * | | | | | | | | | | | common-main: call git_extract_argv0_path()Jeff King2016-07-0112-19/+4
| | * | | | | | | | | | | | add an extra level of indirection to main()Jeff King2016-07-0152-69/+91
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Git 2.9.3v2.9.3Junio C Hamano2016-08-123-2/+13
* | | | | | | | | | | | | Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2016-08-122-59/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | difftool: use Git::* functions instead of passing around stateDavid Aguilar2016-07-281-31/+21
| * | | | | | | | | | | | | difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar2016-07-282-21/+20
| * | | | | | | | | | | | | difftool: fix argument handling in subdirsJohn Keeping2016-07-191-10/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jk/reset-ident-time-per-commit' into maintJunio C Hamano2016-08-123-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am: reset cached ident date for each patchjk/reset-ident-time-per-commitJeff King2016-08-013-0/+8
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Yet another batch for 2.9.3Junio C Hamano2016-08-101-0/+68
* | | | | | | | | | | | | Merge branch 'jh/clean-smudge-f-doc' into maintJunio C Hamano2016-08-101-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clarify %f documentationjh/clean-smudge-f-docJoey Hess2016-08-031-0/+5
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-107-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s"rs/use-strbuf-addstrRené Scharfe2016-08-053-3/+3
| * | | | | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbufRené Scharfe2016-08-014-6/+6
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'cp/completion-clone-recurse-submodules' into maintJunio C Hamano2016-08-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | completion: add option '--recurse-submodules' to 'git clone'cp/completion-clone-recurse-submodulesChris Packham2016-07-271-0/+1
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/t4205-cleanup' into maintJunio C Hamano2016-08-101-198/+200
|\ \ \ \ \ \ \ \ \ \ \ \ \