summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2011-04-112-23/+27
|\
| * gitk: Update cherry-pick error message parsingAnders Kaseorg2011-04-091-1/+1
| * gitk: Quote tag names in event bindings to avoid problems with % charsPat Thoyts2011-03-091-3/+4
| * gitk: Allow user to control how much of the SHA1 ID gets auto-selectedPaul Mackerras2011-03-091-6/+9
| * gitk: spelling fixes in Russian translationSkip2011-01-191-12/+12
| * gitk: Take only numeric version components when computing $git_versionAnders Kaseorg2011-01-191-1/+1
* | git-p4: replace each tab with 8 spaces for consistencyAndrew Garber2011-04-071-32/+32
* | Git 1.7.5-rc1v1.7.5-rc1Junio C Hamano2011-04-063-11/+14
* | Sync with 1.7.4.4Junio C Hamano2011-04-061-6/+4
|\ \
| * | Git 1.7.4.4v1.7.4.4Junio C Hamano2011-04-063-8/+6
| * | Merge branch 'nm/maint-conflicted-submodule-entries' into maintJunio C Hamano2011-04-063-9/+83
| |\ \
| * \ \ Merge branch 'mg/rev-list-n-reverse-doc' into maintJunio C Hamano2011-04-062-161/+163
| |\ \ \
* | \ \ \ Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2011-04-063-19/+136
|\ \ \ \ \
| * | | | | remote: deprecate --mirrorJeff King2011-03-302-5/+7
| * | | | | remote: separate the concept of push and fetch mirrorsJeff King2011-03-303-19/+129
| * | | | | remote: disallow some nonsensical option combinationsJeff King2011-03-301-0/+5
* | | | | | Merge branch 'mg/doc-revisions-txt'Junio C Hamano2011-04-061-91/+107
|\ \ \ \ \ \
| * | | | | | revisions.txt: language improvementsMichael J Gruber2011-04-041-35/+35
| * | | | | | revisions.txt: structure with a labelled listMichael J Gruber2011-04-011-35/+51
| * | | | | | revisions.txt: consistent use of quotesMichael J Gruber2011-04-011-52/+52
* | | | | | | Merge branch 'maint'Junio C Hamano2011-04-042-6/+20
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Documentation: trivial grammar fix in core.worktree descriptionSZEDER Gábor2011-04-041-1/+1
| * | | | | | gitweb: Fix parsing of negative fractional timezones in JavaScriptJakub Narebski2011-04-041-5/+19
* | | | | | | Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-0413-37/+520
|\ \ \ \ \ \ \
| * | | | | | | fetch/pull: Describe --recurse-submodule restrictions in the BUGS sectionJens Lehmann2011-03-092-0/+18
| * | | | | | | submodule update: Don't fetch when the submodule commit is already presentJens Lehmann2011-03-092-1/+24
| * | | | | | | fetch/pull: Don't recurse into a submodule when commits are already presentJens Lehmann2011-03-093-2/+49
| * | | | | | | Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' optionJens Lehmann2011-03-094-5/+38
| * | | | | | | config: teach the fetch.recurseSubmodules option the 'on-demand' valueJens Lehmann2011-03-093-4/+36
| * | | | | | | fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann2011-03-097-10/+114
| * | | | | | | fetch/pull: recurse into submodules when necessaryJens Lehmann2011-03-096-17/+243
* | | | | | | | Merge branch 'jc/rev-list-options-fix'Junio C Hamano2011-04-041-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | "log --cherry-pick" documentation regression fixJunio C Hamano2011-04-011-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'nm/maint-conflicted-submodule-entries'Junio C Hamano2011-04-043-9/+83
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | submodule: process conflicting submodules only onceNicolas Morey-Chaisemartin2011-03-303-9/+83
* | | | | | | | Merge branch 'maint'Junio C Hamano2011-04-032-0/+38
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Start preparing for 1.7.4.4Junio C Hamano2011-04-032-1/+38
| * | | | | | | pull: do not clobber untracked files on initial pullJeff King2011-04-032-1/+12
| * | | | | | | Merge branch 'jc/index-update-if-able' into maintJunio C Hamano2011-04-034-13/+29
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'lt/default-abbrev' into maintJunio C Hamano2011-04-035-3/+23
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-rev-list-culled-boundary' into maintJunio C Hamano2011-04-032-1/+33
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-log-n-with-diff-filtering' into maintJunio C Hamano2011-04-035-1/+26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/format-patch-multiline-header' into maintJunio C Hamano2011-04-034-10/+121
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-instaweb-plack-fix' into maintJunio C Hamano2011-04-031-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lp/config-vername-check' into maintJunio C Hamano2011-04-034-50/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | compat: add missing #include <sys/resource.h>Jonathan Nieder2011-04-031-0/+1
* | | | | | | | | | | | | | | git.el: Don't use font-lock-compile-keywordsLawrence Mitchell2011-04-031-3/+10
* | | | | | | | | | | | | | | t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason2011-04-031-2/+2
* | | | | | | | | | | | | | | Fix two unused variable warnings in gcc 4.6Dan McGee2011-04-032-6/+1
* | | | | | | | | | | | | | | Remove old binaries from .gitignoreDan McGee2011-04-031-2/+0