aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | | worktree: add "unlock" commandNguyễn Thái Ngọc Duy2016-07-08
| * | | | | | | | | | | | | | | | | | | | | | worktree: add "lock" commandNguyễn Thái Ngọc Duy2016-07-08
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: add is_worktree_locked()Nguyễn Thái Ngọc Duy2016-06-13
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: add is_main_worktree()Nguyễn Thái Ngọc Duy2016-06-03
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: add find_worktree()Nguyễn Thái Ngọc Duy2016-06-03
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/notes-merge-no-toctou'Junio C Hamano2016-07-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | notes-merge: use O_EXCL to avoid overwriting existing filesRené Scharfe2016-07-07
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-tests'Junio C Hamano2016-07-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | rebase -i: we allow extra spaces after fixup!/squash!Johannes Schindelin2016-07-07
| * | | | | | | | | | | | | | | | | | | | | | | rebase -i: demonstrate a bug with --autosquashJohannes Schindelin2016-07-07
| * | | | | | | | | | | | | | | | | | | | | | | t3404: add a test for the --gpg-sign optionJohannes Schindelin2016-07-07
* | | | | | | | | | | | | | | | | | | | | | | | Seventh batch of topics for 2.10Junio C Hamano2016-07-25
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addbuf'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()René Scharfe2016-07-22
| * | | | | | | | | | | | | | | | | | | | | | | | use strbuf_addbuf() for appending a strbuf to anotherRené Scharfe2016-07-19
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/autoconf-pthread'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | configure.ac: stronger test for pthread linkageEric Wong2016-07-18
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | t/t8003-blame-corner-cases.sh: Use here documentsMike Hommey2016-07-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | blame: allow to blame paths freshly added to the indexMike Hommey2016-07-18
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/fsck-name-object'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | fsck: optionally show more helpful info for broken linksJohannes Schindelin2016-07-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | fsck: give the error function a chance to see the fsck_optionsJohannes Schindelin2016-07-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | fsck_walk(): optionally name objects on the goJohannes Schindelin2016-07-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | fsck: refactor how to describe objectsJohannes Schindelin2016-07-18
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/cache-tree-ita'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentriesNguyễn Thái Ngọc Duy2016-07-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimesNguyễn Thái Ngọc Duy2016-07-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib.sh: introduce and use $EMPTY_BLOBNguyễn Thái Ngọc Duy2016-07-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib.sh: introduce and use $EMPTY_TREENguyễn Thái Ngọc Duy2016-07-18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-scrub-url'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5541: fix url scrubbing test when GPG is not setJeff King2016-07-20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | push: anonymize URL in status outputJeff King2016-07-14
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t/test-lib.sh: fix running tests with --valgrindJohannes Schindelin2016-07-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: use VCSSVN_LIB to refer to svn libraryJeff King2016-07-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: drop extra dependencies for test helpersJeff King2016-07-06
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-diff-filter-exclude'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: document diff-filter exclusionJunio C Hamano2016-07-14
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/travis-enable-httpd-tests'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | travis-ci: enable web server tests t55xx on LinuxLars Schneider2016-07-12
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano2016-07-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-06
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/worktree-use-strbuf-absolute-path'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: use strbuf_add_absolute_path() directlyRené Scharfe2016-07-12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/rm-strbuf-optim'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rm: reuse strbuf for all remove_dir_recursively() callsRené Scharfe2016-07-12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rw/make-needs-librt'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.mak.uname: define NEEDS_LIBRT under Linux, for nowEric Wong2016-07-11