summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fc/show-branch-in-rebase-am'Junio C Hamano2013-06-062-1/+3
|\
| * prompt: fix for simple rebaseFelipe Contreras2013-05-292-1/+3
* | Merge branch 'nd/clone-connectivity-shortcut'Junio C Hamano2013-06-0613-55/+192
|\ \
| * | clone: open a shortcut for connectivity checkNguyễn Thái Ngọc Duy2013-05-289-15/+94
| * | index-pack: remove dead code (it should never happen)Nguyễn Thái Ngọc Duy2013-05-281-2/+1
| * | fetch-pack: prepare updated shallow file before fetching the packNguyễn Thái Ngọc Duy2013-05-285-38/+93
| * | clone: let the user know when check_everything_connected is runNguyễn Thái Ngọc Duy2013-05-111-0/+4
* | | Merge branch 'nd/prune-packed-dryrun-verbose'Junio C Hamano2013-06-063-9/+11
|\ \ \
| * | | prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()Nguyễn Thái Ngọc Duy2013-05-283-9/+11
| | |/ | |/|
* | | Merge branch 'fc/transport-helper-no-refspec'Junio C Hamano2013-06-061-1/+12
|\ \ \
| * | | transport-helper: check if the dry-run is supportedFelipe Contreras2013-05-211-0/+5
| * | | transport-helper: barf when user tries old:newFelipe Contreras2013-05-211-2/+4
* | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-051-2/+37
* | | | Merge branch 'rs/commit-m-no-edit'Junio C Hamano2013-06-052-4/+23
|\ \ \ \
| * | | | commit: don't start editor if empty message is given with -mRené Scharfe2013-05-282-4/+23
* | | | | Merge branch 'fc/send-email-chainreplyto-warning'Junio C Hamano2013-06-052-66/+2
|\ \ \ \ \
| * | | | | send-email: remove warning about unset chainreplytoFelipe Contreras2013-05-282-66/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'fc/cleanups'Junio C Hamano2013-06-054-19/+11
|\ \ \ \ \
| * | | | | test: rebase: fix --interactive testFelipe Contreras2013-05-281-1/+1
| * | | | | test: trivial cleanupsFelipe Contreras2013-05-282-16/+9
| * | | | | remote: trivial style cleanupFelipe Contreras2013-05-281-2/+1
| |/ / / /
* | | | | Merge branch 'fc/makefile'Junio C Hamano2013-06-051-18/+24
|\ \ \ \ \
| * | | | | build: do not install git-remote-testpyFelipe Contreras2013-05-261-0/+2
| * | | | | build: add NO_INSTALL variableFelipe Contreras2013-05-261-6/+10
| * | | | | build: cleanup using $<Felipe Contreras2013-05-261-5/+5
| * | | | | build: cleanup using $^Felipe Contreras2013-05-261-4/+4
| * | | | | build: trivial simplificationFelipe Contreras2013-05-261-3/+3
| |/ / / /
* | | | | Merge branch 'nd/urls-doc-no-file-hyperlink-fix'Junio C Hamano2013-06-051-1/+1
|\ \ \ \ \
| * | | | | urls.txt: avoid auto converting to hyperlinkNguyễn Thái Ngọc Duy2013-05-241-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'tr/push-no-verify-doc'Junio C Hamano2013-06-051-1/+6
|\ \ \ \ \
| * | | | | Document push --no-verifyThomas Rast2013-05-231-1/+6
| |/ / / /
* | | | | Merge branch 'tg/maint-zsh-svn-remote-prompt'Junio C Hamano2013-06-051-3/+4
|\ \ \ \ \
| * | | | | prompt: fix show upstream with svn and zshThomas Gummerer2013-05-221-3/+4
| |/ / / /
* | | | | Merge branch 'th/bisect-skip-report-range-fix'Junio C Hamano2013-06-051-2/+2
|\ \ \ \ \
| * | | | | bisect: Fix log output for multi-parent skip rangesTorstein Hegge2013-05-221-2/+2
* | | | | | Merge branch 'dm/unbash-subtree'Junio C Hamano2013-06-051-1/+1
|\ \ \ \ \ \
| * | | | | | contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bashDmitry Marakasov2013-05-211-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rr/zsh-color-prompt'Junio C Hamano2013-06-051-39/+85
|\ \ \ \ \ \
| * | | | | | prompt: colorize ZSH promptRamkumar Ramachandra2013-05-171-1/+39
| * | | | | | prompt: factor out gitstring coloring logicRamkumar Ramachandra2013-05-171-36/+43
| * | | | | | prompt: introduce GIT_PS1_STATESEPARATORRamkumar Ramachandra2013-05-171-3/+4
* | | | | | | Merge branch 'jc/core-checkstat'Junio C Hamano2013-06-051-1/+14
|\ \ \ \ \ \ \
| * | | | | | | deprecate core.statinfo at Git 2.0 boundaryJunio C Hamano2013-05-061-1/+14
* | | | | | | | Merge branch 'maint'Junio C Hamano2013-06-041-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | t/README: test_must_fail is for testing GitJunio C Hamano2013-06-041-0/+3
* | | | | | | | | Sync with maintJunio C Hamano2013-06-031-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | sha1_file: trivial style cleanupFelipe Contreras2013-06-031-1/+1
* | | | | | | | | Merge branch 'kb/status-ignored-optim-2'Junio C Hamano2013-06-032-0/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | dir.c: fix ignore processing within not-ignored directoriesKarsten Blees2013-06-022-0/+21
* | | | | | | | | | test: fix post rewrite hook reportFelipe Contreras2013-06-031-2/+2