summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* web--browse: Add support for xdg-openrs/web-browse-xdg-openRüdiger Sonderfeld2013-10-302-3/+4
* Merge branch 'ys/cygstart'Junio C Hamano2013-06-262-3/+9
|\
| * web--browse: support /usr/bin/cygstart on CygwinYaakov Selkowitz2013-06-212-3/+9
* | Merge branch 'wk/doc-git-has-grown'Junio C Hamano2013-06-261-3/+3
|\ \
| * | user-manual: Update download size for Git and the kernelW. Trevor King2013-06-231-3/+3
* | | Merge branch 'vl/typofix'Junio C Hamano2013-06-263-3/+3
|\ \ \
| * | | random typofixes (committed missing a 't', successful missing an 's')Veres Lajos2013-06-193-3/+3
| |/ /
* | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Junio C Hamano2013-06-269-21/+20
|\ \ \
| * | | fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-189-21/+20
* | | | Merge branch 'mm/merge-in-dirty-worktree-doc'Junio C Hamano2013-06-261-2/+2
|\ \ \ \
| * | | | Documentation/git-merge.txt: weaken warning about uncommited changesMatthieu Moy2013-06-181-2/+2
| |/ / /
* | | | Merge branch 'kb/diff-blob-blob-doc'Junio C Hamano2013-06-261-7/+7
|\ \ \ \
| * | | | Documentation: Move "git diff <blob> <blob>"Kevin Bracey2013-06-181-7/+7
| |/ / /
* | | | Merge branch 'mm/push-force-is-dangerous'Junio C Hamano2013-06-261-0/+9
|\ \ \ \
| * | | | Documentation/git-push.txt: explain better cases where --force is dangerousMatthieu Moy2013-06-181-0/+9
| |/ / /
* | | | Merge branch 'fg/submodule-non-ascii-path'Junio C Hamano2013-06-262-1/+17
|\ \ \ \
| * | | | t7400: test of UTF-8 submodule names pass under Mac OSTorsten Bögershausen2013-06-201-8/+11
| * | | | handle multibyte characters in nameFredrik Gustafsson2013-06-142-1/+14
* | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-241-4/+14
* | | | | Merge branch 'rr/am-quit-empty-then-abort-fix'Junio C Hamano2013-06-242-17/+40
|\ \ \ \ \
| * | | | | t/am: use test_path_is_missing() where appropriateRamkumar Ramachandra2013-06-171-17/+17
| * | | | | am: handle stray $dotest directoryRamkumar Ramachandra2013-06-172-0/+23
* | | | | | Merge branch 'rt/cherry-pick-continue-advice-in-status'Junio C Hamano2013-06-242-4/+8
|\ \ \ \ \ \
| * | | | | | wt-status: give better advice when cherry-pick is in progressRalf Thielow2013-06-172-4/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'nk/config-local-doc'Junio C Hamano2013-06-241-0/+9
|\ \ \ \ \ \
| * | | | | | config: Add description of --local optionNamhyung Kim2013-06-171-0/+9
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/mergetool-lib-refactor'Junio C Hamano2013-06-241-47/+35
|\ \ \ \ \ \
| * | | | | | mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping2013-06-171-47/+35
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/doc-build-move-infordir-def'Junio C Hamano2013-06-241-22/+22
|\ \ \ \ \ \
| * | | | | | Documentation/Makefile: move infodir to be with other '*dir'sJohn Keeping2013-06-171-1/+1
| * | | | | | Documentation/Makefile: fix spaces around assignmentsJohn Keeping2013-06-171-21/+21
* | | | | | | Merge branch 'fg/submodule-fixup'Junio C Hamano2013-06-241-2/+2
|\ \ \ \ \ \ \
| * | | | | | | git-submodule.sh: remove duplicate call to set_rev_nameFredrik Gustafsson2013-06-171-2/+2
* | | | | | | | Merge branch 'dk/version-gen-gitdir'Junio C Hamano2013-06-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | GIT-VERSION-GEN: support non-standard $GIT_DIR pathDennis Kaarsemaker2013-06-171-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'dk/maint-t5150-dirname'Junio C Hamano2013-06-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: allow sha1's as part of the pathDennis Kaarsemaker2013-06-171-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Junio C Hamano2013-06-242-16/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | unpack-trees: don't shift conflicts left and rightRené Scharfe2013-06-172-16/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-244-2/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-143-4/+4
| * | | | | | | | sh-setup: add new peel_committish() helperRamkumar Ramachandra2013-06-141-0/+12
| * | | | | | | | t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra2013-06-142-0/+22
* | | | | | | | | Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-245-19/+184
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-125-1/+37
| * | | | | | | | | rm: better error message on failure for multiple filesMathieu Lienard--Mayor2013-06-122-19/+148
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jh/libify-note-handling'Junio C Hamano2013-06-248-189/+203
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland2013-06-124-41/+41
| * | | | | | | | | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland2013-06-126-146/+159
| * | | | | | | | | finish_copy_notes_for_rewrite(): Let caller provide commit messageJohan Herland2013-06-123-6/+7
| |/ / / / / / / /