summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'jc/maint-merge-recursive-fix' into maintJunio C Hamano2009-08-212-3/+80
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-302-3/+80
* | | | | | | | | | | | Merge branch 'zf/maint-gitweb-acname' into maintJunio C Hamano2009-08-211-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: parse_commit_text encoding fixZoltán Füzesi2009-08-051-3/+2
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'np/maint-limit-delta-cache' into maintJunio C Hamano2009-08-212-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | don't let the delta cache grow unbounded in 'git repack'Nicolas Pitre2009-08-052-4/+12
* | | | | | | | | | | | | Merge branch 'jk/maint-show-tag' into maintJunio C Hamano2009-08-211-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | show: add space between multiple itemsJeff King2009-07-191-0/+6
| * | | | | | | | | | | | | show: suppress extra newline when showing annotated tagJeff King2009-07-191-1/+1
* | | | | | | | | | | | | | Merge branch 'sb/maint-pull-rebase' into maintJunio C Hamano2009-08-212-3/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pull: support rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-192-6/+13
| * | | | | | | | | | | | | | t5520-pull: Test for rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-191-0/+14
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | filter-branch: make the usage string fit on 80 chars terminals.Matthieu Moy2009-08-181-6/+6
* | | | | | | | | | | | | | filter-branch: add an example how to add ACKs to a range of commitsJohannes Schindelin2009-08-181-0/+10
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | docs: describe impact of repack on "clone -s"Jeff King2009-08-171-2/+10
* | | | | | | | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-129-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Change mentions of "git programs" to "git commands"Ori Avtalion2009-08-128-10/+10
| * | | | | | | | | | | | Documentation: merge: one <remote> is requiredPaul Bolle2009-08-121-1/+1
| * | | | | | | | | | | | help.c: give correct structure's size to memset()Johan Herland2009-08-121-1/+1
* | | | | | | | | | | | | push: point to 'git pull' and 'git push --force' in case of non-fast forwardMatthieu Moy2009-08-124-5/+103
* | | | | | | | | | | | | Documentation: add: <filepattern>... is optionalPaul Bolle2009-08-121-1/+1
* | | | | | | | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-102-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Fix typos in git-remote.txt and git-symbolic-ref.txtŠtěpán Němec2009-08-102-4/+4
* | | | | | | | | | | | | git-instaweb: fix mod_perl detection for apache2Mark A Rada2009-08-091-1/+1
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-072-11/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | / / / / / / / / / | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-08-072-11/+27
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-08-072-11/+27
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-08-072-11/+27
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | / / | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | | * | | | | | verify-pack -v: do not report "chain length 0"Junio C Hamano2009-08-071-8/+19
| | | | * | | | | | t5510: harden the way verify-pack is usedJunio C Hamano2009-08-071-3/+8
* | | | | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-055-9/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Better usage string for reflog.Matthieu Moy2009-08-051-1/+1
| * | | | | | | | | hg-to-git: don't import the unused popen2 moduleMiklos Vajna2009-08-041-1/+1
| * | | | | | | | | send-email: remove debug traceErik Faye-Lund2009-08-041-1/+0
| * | | | | | | | | config: Keep inner whitespace verbatimBjörn Steinbrink2009-07-312-6/+9
* | | | | | | | | | gitweb/README: Document $base_urlJakub Narebski2009-08-051-0/+6
* | | | | | | | | | Documentation: git submodule: add missing options to synopsisJens Lehmann2009-08-051-2/+2
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | GIT 1.6.4v1.6.4Junio C Hamano2009-07-293-7/+15
* | | | | | | | | Sync with 1.6.3.4Junio C Hamano2009-07-293-2/+39
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | GIT 1.6.3.4v1.6.3.4Junio C Hamano2009-07-283-2/+38
| * | | | | | | | config.txt: document add.ignore-errorsStephen Boyd2009-07-281-0/+5
| * | | | | | | | request-pull: allow ls-remote to notice remote.$nickname.uploadpackTom Grennan2009-07-281-1/+1
* | | | | | | | | Update the documentation of the raw diff output formatDavid Kågedal2009-07-285-9/+10
* | | | | | | | | git-rerere.txt: Clarify ambiguity of the config variableMichael J Gruber2009-07-281-1/+1
* | | | | | | | | t9143: do not fail if Compress::Zlib is missingEric Wong2009-07-261-3/+12
* | | | | | | | | Trivial path quoting fixes in git-instawebSean Estabrooks2009-07-261-2/+2
* | | | | | | | | Merge branch 'gp/maint-rebase-p-onto'Junio C Hamano2009-07-262-1/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix rebase -p --ontoGreg Price2009-07-222-1/+81
* | | | | | | | | | Merge branch 'en/fast-export'Junio C Hamano2009-07-263-8/+187
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-export: Document the fact that git-rev-list arguments are acceptedElijah Newren2009-06-271-0/+6