aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'bc/http-keep-memory-given-to-curl'Junio C Hamano2013-06-27
|\
| * http.c: don't rewrite the user:passwd string multiple timesBrandon Casey2013-06-19
* | Merge branch 'bc/checkout-tracking-name-plug-leak'Junio C Hamano2013-06-27
|\ \
| * | t/t9802: explicitly name the upstream branch to use as a baseBrandon Casey2013-06-18
| * | builtin/checkout.c: don't leak memory in check_tracking_nameBrandon Casey2013-06-18
* | | Merge branch 'rr/rebase-stash-store'Junio C Hamano2013-06-27
|\ \ \
| * | | rebase: use 'git stash store' to simplify logicRamkumar Ramachandra2013-06-17
| * | | stash: introduce 'git stash store'Ramkumar Ramachandra2013-06-17
| * | | stash: simplify option parser for createRamkumar Ramachandra2013-06-17
| * | | stash doc: document short form -p in synopsisRamkumar Ramachandra2013-06-17
| * | | stash doc: add a warning about using createRamkumar Ramachandra2013-06-17
* | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-26
* | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix'Junio C Hamano2013-06-26
|\ \ \ \
| * | | | apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-21
* | | | | Merge branch 'ys/cygstart'Junio C Hamano2013-06-26
|\ \ \ \ \
| * | | | | web--browse: support /usr/bin/cygstart on CygwinYaakov Selkowitz2013-06-21
* | | | | | Merge branch 'wk/doc-git-has-grown'Junio C Hamano2013-06-26
|\ \ \ \ \ \
| * | | | | | user-manual: Update download size for Git and the kernelW. Trevor King2013-06-23
* | | | | | | Merge branch 'vl/typofix'Junio C Hamano2013-06-26
|\ \ \ \ \ \ \
| * | | | | | | random typofixes (committed missing a 't', successful missing an 's')Veres Lajos2013-06-19
| |/ / / / / /
* | | | | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Junio C Hamano2013-06-26
|\ \ \ \ \ \ \
| * | | | | | | fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'mm/merge-in-dirty-worktree-doc'Junio C Hamano2013-06-26
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git-merge.txt: weaken warning about uncommited changesMatthieu Moy2013-06-18
| |/ / / / / /
* | | | | | | Merge branch 'kb/diff-blob-blob-doc'Junio C Hamano2013-06-26
|\ \ \ \ \ \ \
| * | | | | | | Documentation: Move "git diff <blob> <blob>"Kevin Bracey2013-06-18
| |/ / / / / /
* | | | | | | Merge branch 'mm/push-force-is-dangerous'Junio C Hamano2013-06-26
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git-push.txt: explain better cases where --force is dangerousMatthieu Moy2013-06-18
| |/ / / / / /
* | | | | | | Merge branch 'fg/submodule-non-ascii-path'Junio C Hamano2013-06-26
|\ \ \ \ \ \ \
| * | | | | | | t7400: test of UTF-8 submodule names pass under Mac OSTorsten Bögershausen2013-06-20
| * | | | | | | handle multibyte characters in nameFredrik Gustafsson2013-06-14
* | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-24
* | | | | | | | Merge branch 'rr/am-quit-empty-then-abort-fix'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | t/am: use test_path_is_missing() where appropriateRamkumar Ramachandra2013-06-17
| * | | | | | | | am: handle stray $dotest directoryRamkumar Ramachandra2013-06-17
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'rt/cherry-pick-continue-advice-in-status'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | wt-status: give better advice when cherry-pick is in progressRalf Thielow2013-06-17
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nk/config-local-doc'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | config: Add description of --local optionNamhyung Kim2013-06-17
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/mergetool-lib-refactor'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping2013-06-17
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/doc-build-move-infordir-def'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/Makefile: move infodir to be with other '*dir'sJohn Keeping2013-06-17
| * | | | | | | | Documentation/Makefile: fix spaces around assignmentsJohn Keeping2013-06-17
* | | | | | | | | Merge branch 'fg/submodule-fixup'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-submodule.sh: remove duplicate call to set_rev_nameFredrik Gustafsson2013-06-17
* | | | | | | | | | Merge branch 'dk/version-gen-gitdir'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | GIT-VERSION-GEN: support non-standard $GIT_DIR pathDennis Kaarsemaker2013-06-17
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dk/maint-t5150-dirname'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tests: allow sha1's as part of the pathDennis Kaarsemaker2013-06-17
| |/ / / / / / / / /