Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am: replace uses of --resolved with --continue | Kevin Bracey | 2013-06-27 | 5 | -10/+10 |
* | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-27 | 1 | -0/+12 |
* | Merge branch 'tr/maint-apply-non-git-patch-parsefix' | Junio C Hamano | 2013-06-27 | 2 | -1/+15 |
|\ | |||||
| * | apply: carefully strdup a possibly-NULL name | Thomas Rast | 2013-06-21 | 2 | -1/+15 |
* | | Merge branch 'ys/cygstart' | Junio C Hamano | 2013-06-27 | 2 | -3/+9 |
|\ \ | |||||
| * | | web--browse: support /usr/bin/cygstart on Cygwin | Yaakov Selkowitz | 2013-06-21 | 2 | -3/+9 |
* | | | Merge branch 'wk/doc-git-has-grown' | Junio C Hamano | 2013-06-27 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | user-manual: Update download size for Git and the kernel | W. Trevor King | 2013-06-23 | 1 | -3/+3 |
* | | | | Merge branch 'vl/typofix' | Junio C Hamano | 2013-06-27 | 3 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | random typofixes (committed missing a 't', successful missing an 's') | Veres Lajos | 2013-06-19 | 3 | -3/+3 |
| |/ / / | |||||
* | | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' | Junio C Hamano | 2013-06-27 | 9 | -21/+20 |
|\ \ \ \ | |||||
| * | | | | fix "builtin-*" references to be "builtin/*" | Phil Hord | 2013-06-18 | 9 | -21/+20 |
* | | | | | Merge branch 'mm/merge-in-dirty-worktree-doc' | Junio C Hamano | 2013-06-27 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/git-merge.txt: weaken warning about uncommited changes | Matthieu Moy | 2013-06-18 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'kb/diff-blob-blob-doc' | Junio C Hamano | 2013-06-27 | 1 | -7/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation: Move "git diff <blob> <blob>" | Kevin Bracey | 2013-06-18 | 1 | -7/+7 |
| |/ / / / | |||||
* | | | | | Merge branch 'mm/push-force-is-dangerous' | Junio C Hamano | 2013-06-27 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/git-push.txt: explain better cases where --force is dangerous | Matthieu Moy | 2013-06-18 | 1 | -0/+9 |
| |/ / / / | |||||
* | | | | | Merge branch 'fg/submodule-non-ascii-path' | Junio C Hamano | 2013-06-27 | 2 | -1/+17 |
|\ \ \ \ \ | |||||
| * | | | | | t7400: test of UTF-8 submodule names pass under Mac OS | Torsten Bögershausen | 2013-06-20 | 1 | -8/+11 |
| * | | | | | handle multibyte characters in name | Fredrik Gustafsson | 2013-06-14 | 2 | -1/+14 |
* | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-24 | 1 | -4/+14 |
* | | | | | | Merge branch 'rr/am-quit-empty-then-abort-fix' | Junio C Hamano | 2013-06-24 | 2 | -17/+40 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/am: use test_path_is_missing() where appropriate | Ramkumar Ramachandra | 2013-06-17 | 1 | -17/+17 |
| * | | | | | | am: handle stray $dotest directory | Ramkumar Ramachandra | 2013-06-17 | 2 | -0/+23 |
* | | | | | | | Merge branch 'rt/cherry-pick-continue-advice-in-status' | Junio C Hamano | 2013-06-24 | 2 | -4/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | wt-status: give better advice when cherry-pick is in progress | Ralf Thielow | 2013-06-17 | 2 | -4/+8 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nk/config-local-doc' | Junio C Hamano | 2013-06-24 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | config: Add description of --local option | Namhyung Kim | 2013-06-17 | 1 | -0/+9 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/mergetool-lib-refactor' | Junio C Hamano | 2013-06-24 | 1 | -47/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mergetool--lib: refactor {diff,merge}_cmd logic | John Keeping | 2013-06-17 | 1 | -47/+35 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/doc-build-move-infordir-def' | Junio C Hamano | 2013-06-24 | 1 | -22/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation/Makefile: move infodir to be with other '*dir's | John Keeping | 2013-06-17 | 1 | -1/+1 |
| * | | | | | | | Documentation/Makefile: fix spaces around assignments | John Keeping | 2013-06-17 | 1 | -21/+21 |
* | | | | | | | | Merge branch 'fg/submodule-fixup' | Junio C Hamano | 2013-06-24 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-submodule.sh: remove duplicate call to set_rev_name | Fredrik Gustafsson | 2013-06-17 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'dk/version-gen-gitdir' | Junio C Hamano | 2013-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | GIT-VERSION-GEN: support non-standard $GIT_DIR path | Dennis Kaarsemaker | 2013-06-17 | 1 | -1/+1 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'dk/maint-t5150-dirname' | Junio C Hamano | 2013-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | tests: allow sha1's as part of the path | Dennis Kaarsemaker | 2013-06-17 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'rs/unpack-trees-tree-walk-conflict-field' | Junio C Hamano | 2013-06-24 | 2 | -16/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | unpack-trees: don't shift conflicts left and right | René Scharfe | 2013-06-17 | 2 | -16/+4 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rr/rebase-sha1-by-string-query' | Junio C Hamano | 2013-06-24 | 4 | -2/+36 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase: use peel_committish() where appropriate | Ramkumar Ramachandra | 2013-06-14 | 3 | -4/+4 |
| * | | | | | | | | | sh-setup: add new peel_committish() helper | Ramkumar Ramachandra | 2013-06-14 | 1 | -0/+12 |
| * | | | | | | | | | t/rebase: add failing tests for a peculiar revision | Ramkumar Ramachandra | 2013-06-14 | 2 | -0/+22 |
* | | | | | | | | | | Merge branch 'mm/rm-coalesce-errors' | Junio C Hamano | 2013-06-24 | 5 | -19/+184 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rm: introduce advice.rmHints to shorten messages | Mathieu Lienard--Mayor | 2013-06-13 | 5 | -1/+37 |
| * | | | | | | | | | | rm: better error message on failure for multiple files | Mathieu Lienard--Mayor | 2013-06-13 | 2 | -19/+148 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jh/libify-note-handling' | Junio C Hamano | 2013-06-24 | 8 | -189/+203 |
|\ \ \ \ \ \ \ \ \ \ |