Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2011-04-14 | 2 | -1/+5 |
|\ | |||||
| * | t3306,t5304: avoid clock skew issues | Michael J Gruber | 2011-04-14 | 2 | -1/+5 |
| * | Merge branch 'js/checkout-untracked-symlink' into maint | Junio C Hamano | 2011-04-13 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'nm/maint-conflicted-submodule-entries' into maint | Junio C Hamano | 2011-04-06 | 1 | -6/+52 |
| |\ \ | |||||
| * | | | pull: do not clobber untracked files on initial pull | Jeff King | 2011-04-03 | 1 | -0/+11 |
| * | | | Merge branch 'jc/maint-rev-list-culled-boundary' into maint | Junio C Hamano | 2011-04-03 | 1 | -0/+27 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'mm/maint-log-n-with-diff-filtering' into maint | Junio C Hamano | 2011-04-03 | 4 | -0/+19 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/format-patch-multiline-header' into maint | Junio C Hamano | 2011-04-03 | 1 | -0/+84 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'lp/config-vername-check' into maint | Junio C Hamano | 2011-04-03 | 1 | -4/+18 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'pk/stash-apply-status-relative' into maint | Junio C Hamano | 2011-04-01 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/maint-diff-q-filter' into maint | Junio C Hamano | 2011-04-01 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jh/maint-do-not-track-non-branches' into maint | Junio C Hamano | 2011-04-01 | 3 | -15/+31 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'js/checkout-untracked-symlink' into maint | Junio C Hamano | 2011-04-01 | 2 | -3/+61 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge "checkout ambiguous ref bugfix" into maint | Junio C Hamano | 2011-04-01 | 1 | -0/+59 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/checkout-untracked-symlink' | Junio C Hamano | 2011-04-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | t2021: mark a test as fixed | Johannes Sixt | 2011-04-12 | 1 | -1/+1 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'nd/init-gitdir' | Junio C Hamano | 2011-04-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t0001: guard a new test with SYMLINKS prerequisite | Johannes Sixt | 2011-04-11 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer' | Junio C Hamano | 2011-04-06 | 1 | -0/+78 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | remote: separate the concept of push and fetch mirrors | Jeff King | 2011-03-30 | 1 | -0/+78 |
* | | | | | | | | | | | | | | Merge branch 'jl/submodule-fetch-on-demand' | Junio C Hamano | 2011-04-04 | 3 | -1/+276 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | submodule update: Don't fetch when the submodule commit is already present | Jens Lehmann | 2011-03-09 | 1 | -0/+20 |
| * | | | | | | | | | | | | | | fetch/pull: Don't recurse into a submodule when commits are already present | Jens Lehmann | 2011-03-09 | 1 | -0/+19 |
| * | | | | | | | | | | | | | | Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option | Jens Lehmann | 2011-03-09 | 1 | -0/+28 |
| * | | | | | | | | | | | | | | config: teach the fetch.recurseSubmodules option the 'on-demand' value | Jens Lehmann | 2011-03-09 | 1 | -0/+28 |
| * | | | | | | | | | | | | | | fetch/pull: Add the 'on-demand' value to the --recurse-submodules option | Jens Lehmann | 2011-03-09 | 1 | -0/+71 |
| * | | | | | | | | | | | | | | fetch/pull: recurse into submodules when necessary | Jens Lehmann | 2011-03-09 | 2 | -1/+110 |
* | | | | | | | | | | | | | | | Merge branch 'nm/maint-conflicted-submodule-entries' | Junio C Hamano | 2011-04-04 | 1 | -6/+52 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | submodule: process conflicting submodules only once | Nicolas Morey-Chaisemartin | 2011-03-30 | 1 | -6/+52 |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT | Ævar Arnfjörð Bjarmason | 2011-04-03 | 1 | -2/+2 |
* | | | | | | | | | | | | | | Merge branch 'nd/init-gitdir' | Junio C Hamano | 2011-04-01 | 2 | -0/+59 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | init, clone: support --separate-git-dir for .git file | Nguyễn Thái Ngọc Duy | 2011-03-19 | 2 | -0/+59 |
* | | | | | | | | | | | | | | Merge branch 'jr/grep-en-config' | Junio C Hamano | 2011-04-01 | 1 | -1/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | grep: allow -E and -n to be turned on by default via configuration | Joe Ratterman | 2011-03-30 | 1 | -1/+23 |
* | | | | | | | | | | | | | | | Merge branch 'ab/i18n-st' | Junio C Hamano | 2011-04-01 | 34 | -156/+257 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | i18n: git-revert split up "could not revert/apply" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | i18n: git-revert "Your local changes" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | i18n: git-describe basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | i18n: git-clean basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 2 | -5/+5 |
| * | | | | | | | | | | | | | | | i18n: git-status "renamed: " message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | i18n: git-status "Initial commit" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -2/+5 |
| * | | | | | | | | | | | | | | | i18n: git-status "Changes to be committed" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -10/+10 |
| * | | | | | | | | | | | | | | | i18n: git-status "nothing to commit" messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | i18n: git-status basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 3 | -61/+76 |
| * | | | | | | | | | | | | | | | i18n: git-push "prevent you from losing" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 2 | -3/+6 |
| * | | | | | | | | | | | | | | | i18n: git-tag tag_template message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | i18n: git-reset "Unstaged changes after reset" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | i18n: git-merge "Wonderful" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | i18n: git-merge "You have not concluded your merge" messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | i18n: git-merge "Updating %s..%s" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+4 |