summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | | sparse: Fix errors and silence warningsStephen Boyd2011-04-037-9/+9
* | | | | | | | | | | | Update release notesJunio C Hamano2011-04-032-23/+21
* | | | | | | | | | | | Sync with 1.7.4.3Junio C Hamano2011-04-032-1/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Git 1.7.4.3v1.7.4.3Junio C Hamano2011-04-033-2/+34
| * | | | | | | | | | | Doc: mention --delta-base-offset is the default for Porcelain commandsJunio C Hamano2011-04-021-1/+6
* | | | | | | | | | | | Merge branch 'nd/init-gitdir'Junio C Hamano2011-04-017-31/+176
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | init, clone: support --separate-git-dir for .git fileNguyễn Thái Ngọc Duy2011-03-197-6/+157
| * | | | | | | | | | | | git-init.txt: move description section upNguyễn Thái Ngọc Duy2011-03-191-26/+20
* | | | | | | | | | | | | Merge branch 'jc/merge-sans-branch'Junio C Hamano2011-04-013-5/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: merge with the default upstream branch without argumentJunio C Hamano2011-03-243-4/+56
| * | | | | | | | | | | | | merge: match the help text with the documentationJared Hance2011-03-241-2/+3
* | | | | | | | | | | | | | Merge branch 'jr/grep-en-config'Junio C Hamano2011-04-014-1/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: allow -E and -n to be turned on by default via configurationJoe Ratterman2011-03-304-1/+52
* | | | | | | | | | | | | | | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-0159-875/+1009
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | i18n: git-shortlog basic messagesÆvar Arnfjörð Bjarmason2011-03-091-4/+4
| * | | | | | | | | | | | | | | i18n: git-revert split up "could not revert/apply" messageÆvar Arnfjörð Bjarmason2011-03-092-3/+4
| * | | | | | | | | | | | | | | i18n: git-revert literal "me" messagesÆvar Arnfjörð Bjarmason2011-03-091-2/+5
| * | | | | | | | | | | | | | | i18n: git-revert "Your local changes" messageÆvar Arnfjörð Bjarmason2011-03-092-6/+14
| * | | | | | | | | | | | | | | i18n: git-revert basic messagesÆvar Arnfjörð Bjarmason2011-03-091-23/+23
| * | | | | | | | | | | | | | | i18n: git-notes GIT_NOTES_REWRITE_MODE error messageÆvar Arnfjörð Bjarmason2011-03-091-2/+4
| * | | | | | | | | | | | | | | i18n: git-notes basic commandsÆvar Arnfjörð Bjarmason2011-03-091-53/+53
| * | | | | | | | | | | | | | | i18n: git-gc "Auto packing the repository" messageÆvar Arnfjörð Bjarmason2011-03-091-7/+7
| * | | | | | | | | | | | | | | i18n: git-gc basic messagesÆvar Arnfjörð Bjarmason2011-03-091-5/+5