summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-docMichael Schubert2013-07-036-14/+17
* t7500: fix flipped actual/expectAndrew Pimlott2013-07-011-3/+3
* lib-rebase: document exec_ in FAKE_LINESAndrew Pimlott2013-07-011-0/+2
* Start preparing for 1.8.3.3Junio C Hamano2013-06-302-1/+12
* Merge branch 'fc/macos-x-clipped-write' into maintJunio C Hamano2013-06-304-0/+27
|\
| * compate/clipped-write.c: large write(2) fails on Mac OS X/XNUFilipe Cabecinhas2013-05-174-0/+27
* | Merge branch 'da/darwin' into maintJunio C Hamano2013-06-302-0/+25
|\ \
| * | imap-send: eliminate HMAC deprecation warnings on Mac OS XDavid Aguilar2013-05-211-0/+10
| * | cache.h: eliminate SHA-1 deprecation warnings on Mac OS XDavid Aguilar2013-05-201-0/+6
| * | Makefile: add support for Apple CommonCrypto facilityDavid Aguilar2013-05-201-0/+8
| * | Makefile: fix default regex settings on DarwinDavid Aguilar2013-05-111-0/+1
* | | check-ignore doc: fix broken link to ls-files pageRamkumar Ramachandra2013-06-301-1/+1
* | | test: spell 'ls-files --delete' option correctly in test descriptionsSZEDER Gábor2013-06-301-2/+2
* | | Git 1.8.3.2v1.8.3.2Junio C Hamano2013-06-283-2/+8
* | | configure: fix option help message for --disable-pthreadsStefano Lattarini2013-06-281-1/+1
* | | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano2013-06-286-38/+97
|\ \ \
| * | | 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
| |/ /
* | | Start preparing for 1.8.3.2Junio C Hamano2013-06-272-1/+55
* | | Merge branch 'ks/difftool-dir-diff-copy-fix' into maintJunio C Hamano2013-06-272-7/+21
|\ \ \
| * | | difftool --dir-diff: allow changing any clean working tree fileKenichi Saita2013-05-292-7/+21
* | | | Merge branch 'rr/push-head' into maintJunio C Hamano2013-06-271-7/+14
|\ \ \ \
| * | | | push: make push.default = current use resolved HEADRamkumar Ramachandra2013-05-291-1/+1
| * | | | push: fail early with detached HEAD and currentRamkumar Ramachandra2013-05-291-0/+5
| * | | | push: factor out the detached HEAD error messageRamkumar Ramachandra2013-05-291-6/+8
| |/ / /
* | | | Merge branch 'fc/show-branch-in-rebase-am' into maintJunio C Hamano2013-06-272-1/+3
|\ \ \ \
| * | | | prompt: fix for simple rebaseFelipe Contreras2013-05-292-1/+3
| |/ / /
* | | | Merge branch 'tg/maint-zsh-svn-remote-prompt' into maintJunio C Hamano2013-06-271-3/+4
|\ \ \ \
| * | | | prompt: fix show upstream with svn and zshThomas Gummerer2013-05-221-3/+4
* | | | | Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maintJunio C Hamano2013-06-271-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' into maintJunio C Hamano2013-06-271-1/+6
|\ \ \ \ \
| * | | | | Document push --no-verifyThomas Rast2013-05-231-1/+6
| |/ / / /
* | | | | Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2013-06-272-4/+23
|\ \ \ \ \
| * | | | | commit: don't start editor if empty message is given with -mRené Scharfe2013-05-282-4/+23
| |/ / / /
* | | | | Merge branch 'jc/strbuf-branchname-fix' into maintJunio C Hamano2013-06-272-4/+19
|\ \ \ \ \
| * | | | | strbuf_branchname(): do not double-expand @{-1}~22Junio C Hamano2013-05-162-4/+19
* | | | | | Merge branch 'mk/combine-diff-context-horizon-fix' into maintJunio C Hamano2013-06-272-2/+53
|\ \ \ \ \ \
| * | | | | | combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman2013-05-152-2/+53
* | | | | | | Merge branch 'kb/ancestry-path-threedots' into maintJunio C Hamano2013-06-273-1/+38
|\ \ \ \ \ \ \
| * | | | | | | revision.c: treat A...B merge bases as if manually specifiedKevin Bracey2013-05-163-1/+19
| * | | | | | | t6019: demonstrate --ancestry-path A...B breakageKevin Bracey2013-05-131-1/+20
* | | | | | | | Merge branch 'jk/subtree-do-not-push-if-split-fails' into maintJunio C Hamano2013-06-271-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | contrib/subtree: don't delete remote branches if split failsJohn Keeping2013-05-011-1/+2
* | | | | | | | | Merge branch 'mh/fetch-into-shallow' into maintJunio C Hamano2013-06-273-3/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5500: add test for fetching with an unknown 'shallow'Michael Heemskerk2013-05-021-0/+14
| * | | | | | | | | upload-pack: ignore 'shallow' lines with unknown obj-idsMichael Heemskerk2013-04-282-3/+2
* | | | | | | | | | Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-278-35/+221
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | glossary: Update and rephrase the definition of a remote-tracking branchJohan Herland2013-04-211-6/+7
| * | | | | | | | | | branch.c: Validate tracking branches with refspecs instead of refs/remotes/*Johan Herland2013-04-213-3/+18