summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fc/at-head'Junio C Hamano2013-06-115-57/+123
|\
| * sha1_name: compare variable with constant, not constant with variableFelipe Contreras2013-05-081-5/+7
| * Add new @ shortcut for HEADFelipe Contreras2013-05-085-0/+28
| * sha1_name: refactor reinterpret()Felipe Contreras2013-05-081-19/+23
| * sha1_name: check @{-N} errors soonerRamkumar Ramachandra2013-05-081-5/+4
| * sha1_name: reorganize get_sha1_basic()Felipe Contreras2013-05-081-11/+19
| * sha1_name: don't waste cycles in the @-parsing loopRamkumar Ramachandra2013-05-081-1/+1
| * sha1_name: remove unnecessary bracesFelipe Contreras2013-05-081-3/+2
| * sha1_name: remove no-opFelipe Contreras2013-05-081-1/+1
| * tests: at-combinations: @{N} versus HEAD@{N}Ramkumar Ramachandra2013-05-081-0/+13
| * tests: at-combinations: increase coverageRamkumar Ramachandra2013-05-081-0/+8
| * tests: at-combinations: improve nonsense()Felipe Contreras2013-05-081-1/+1
| * tests: at-combinations: check ref names directlyFelipe Contreras2013-05-081-16/+23
| * tests: at-combinations: simplify setupFelipe Contreras2013-05-071-4/+2
* | Merge branch 'ar/wildmatch-foldcase'Junio C Hamano2013-06-112-6/+56
|\ \
| * | wildmatch: properly fold case everywhereAnthony Ramine2013-06-022-6/+56
* | | Merge branch 'tr/sha1-file-silence-loose-object-info-under-prune-race'Junio C Hamano2013-06-111-1/+1
|\ \ \
| * | | sha1_file: silence sha1_loose_object_infoThomas Rast2013-06-031-1/+1
* | | | Merge branch 'nd/warn-ambiguous-object-name'Junio C Hamano2013-06-114-2/+44
|\ \ \ \
| * | | | get_sha1: warn about full or short object names that look like refsNguyễn Thái Ngọc Duy2013-05-294-2/+44
* | | | | Merge branch 'rr/diffcore-pickaxe-doc'Junio C Hamano2013-06-113-28/+59
|\ \ \ \ \
| * | | | | diffcore-pickaxe doc: document -S and -G properlyRamkumar Ramachandra2013-06-032-26/+57
| * | | | | diffcore-pickaxe: make error messages more consistentRamkumar Ramachandra2013-06-031-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'cr/git-work-tree-sans-git-dir'Junio C Hamano2013-06-111-3/+1
|\ \ \ \ \
| * | | | | git.txt: remove stale comment regarding GIT_WORK_TREEChris Rorvick2013-06-031-3/+1
* | | | | | Merge branch 'mm/mediawiki-https-fail-message'Junio C Hamano2013-06-111-8/+18
|\ \ \ \ \ \
| * | | | | | git-remote-mediawiki: better error message when HTTP(S) access failsMatthieu Moy2013-05-291-8/+18
* | | | | | | Merge branch 'cb/log-follow-with-combined'Junio C Hamano2013-06-112-0/+17
|\ \ \ \ \ \ \
| * | | | | | | fix segfault with git log -c --followClemens Buchacher2013-05-282-0/+17
* | | | | | | | Merge branch 'xq/credential-osxkeychain'Junio C Hamano2013-06-111-1/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | credential-osxkeychain: support more protocolsXidorn Quan2013-05-281-1/+11
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fc/do-not-use-the-index-in-add-to-index'Junio C Hamano2013-06-111-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | read-cache: trivial style cleanupsFelipe Contreras2013-06-031-2/+2
| * | | | | | | | read-cache: fix wrong 'the_index' usageFelipe Contreras2013-06-031-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fc/remote-bzr'Junio C Hamano2013-06-111-57/+55
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-bzr: add fallback check for a partial cloneFelipe Contreras2013-05-281-1/+4
| * | | | | | | | remote-bzr: reorganize the way 'wanted' worksFelipe Contreras2013-05-281-32/+26
| * | | | | | | | remote-bzr: trivial cleanupsFelipe Contreras2013-05-281-7/+7
| * | | | | | | | remote-bzr: change global repoFelipe Contreras2013-05-281-2/+2
| * | | | | | | | remote-bzr: delay cloning/pullingFelipe Contreras2013-05-281-15/+13
| * | | | | | | | remote-bzr: simplify get_remote_branch()Felipe Contreras2013-05-281-11/+12
| * | | | | | | | remote-bzr: fix for files with spacesFelipe Contreras2013-05-281-1/+1
| * | | | | | | | remote-bzr: recover from failed clonesFelipe Contreras2013-05-281-8/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fc/remote-hg'Junio C Hamano2013-06-116-522/+1300
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-hg: add support for --forceFelipe Contreras2013-05-282-13/+50
| * | | | | | | | remote-hg: add support for --dry-runFelipe Contreras2013-05-282-2/+65
| * | | | | | | | remote-hg: check if a fetch is neededFelipe Contreras2013-05-282-1/+109
| * | | | | | | | remote-hg: trivial cleanupFelipe Contreras2013-05-281-7/+4
| * | | | | | | | remote-helpers: improve marks usageFelipe Contreras2013-05-282-3/+9
| * | | | | | | | remote-hg: add check_push() helperFelipe Contreras2013-05-281-17/+49