summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff: Rename QUIET internal option to QUICKJunio C Hamano2009-07-297-9/+9
* diff: change semantics of "ignore whitespace" optionsJunio C Hamano2009-07-294-4/+97
* 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
| * | | Add new fast-export testcasesElijah Newren2009-06-271-0/+88
| * | | fast-export: Add a --tag-of-filtered-object option for newly dangling tagsElijah Newren2009-06-272-2/+68
| * | | fast-export: Do parent rewriting to avoid dropping relevant commitsElijah Newren2009-06-271-0/+1
| * | | fast-export: Make sure we show actual ref names instead of "(null)"Elijah Newren2009-06-271-4/+1
| * | | fast-export: Omit tags that tag treesElijah Newren2009-06-272-1/+22
| * | | fast-export: Set revs.topo_order before calling setup_revisionsElijah Newren2009-06-271-1/+1
* | | | GIT 1.6.4-rc3v1.6.4-rc3Junio C Hamano2009-07-261-4/+7
* | | | Documentation/config.txt: a variable can be defined on the section header lineNanako Shiraishi2009-07-251-1/+2
* | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-07-254-6/+122
|\ \ \ \
| * | | | git svn: make minimize URL more reliable over http(s)Eric Wong2009-07-251-1/+5
| * | | | git svn: avoid escaping '/' when renaming/copying filesEric Wong2009-07-251-1/+1
| * | | | t9142: stop httpd after the testEric Wong2009-07-251-0/+2
| * | | | git svn: the branch command no longer needs the full pathEric Wong2009-07-252-7/+20
| * | | | git svn: revert default behavior for --minimize-urlEric Wong2009-07-253-5/+21
| * | | | git svn: add gc commandRobert Allan Zeh2009-07-253-0/+81
* | | | | Disable asciidoc 8.4.1+ semantics for `{plus}` and friendsThomas Rast2009-07-251-1/+1
|/ / / /
* | | | Merge branch 'maint'Junio C Hamano2009-07-254-17/+19
|\ \ \ \ | | |_|/ | |/| |
| * | | t8005: Nobody writes Russian in shift_jisJunio C Hamano2009-07-254-17/+19
* | | | Merge branch 'maint'Junio C Hamano2009-07-252-5/+9
|\ \ \ \ | |/ / /
| * | | Fix severe breakage in "git-apply --whitespace=fix"Junio C Hamano2009-07-252-5/+9
* | | | Update release notes for 1.6.4Junio C Hamano2009-07-251-2/+13
* | | | Merge branch 'js/maint-graft-unhide-true-parents'Junio C Hamano2009-07-257-3/+31
|\ \ \ \
| * | | | git repack: keep commits hidden by a graftJohannes Schindelin2009-07-247-4/+20
| * | | | Add a test showing that 'git repack' throws away grafted-away parentsBjörn Steinbrink2009-07-231-0/+12
* | | | | Merge branch 'av/maint-config-reader'Junio C Hamano2009-07-252-6/+57
|\ \ \ \ \
| * | | | | After renaming a section, print any trailing variable definitionsAlex Vandiver2009-07-242-3/+41
| * | | | | Make section_name_match start on '[', and return the length on successAlex Vandiver2009-07-241-3/+16
| |/ / / /
* | | | | Merge branch 'jk/maint-send-email-alias-loop'Junio C Hamano2009-07-251-7/+11
|\ \ \ \ \
| * | | | | send-email: detect cycles in alias expansionJeff King2009-07-241-7/+11
| |/ / / /
* | | | | Show the presence of untracked files in the bash prompt.Daniel Trstenjak2009-07-241-2/+13
* | | | | Merge branch 'maint'Junio C Hamano2009-07-244-33/+53
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | SunOS grep does not understand -C<n> nor -eJunio C Hamano2009-07-241-0/+1
| * | | | Fix export_marks() error handling.Matthias Andree2009-07-241-4/+10
| * | | | git branch: clean up detached branch handlingLinus Torvalds2009-07-231-15/+23
| * | | | git branch: avoid unnecessary object lookupsLinus Torvalds2009-07-231-10/+14
View Lorry Controller Status