summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* drop odd return value semantics from userdiff_configjk/userdiff-config-simplifyJeff King2012-02-075-37/+12
* Sync with maintJunio C Hamano2012-02-063-24/+21
|\
| * Prepare for 1.7.9.1Junio C Hamano2012-02-062-1/+20
| * completion: --edit and --no-edit for git-mergeAdrian Weimann2012-02-061-1/+1
| * Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano2012-02-052-4/+33
| |\
| * \ Merge branch 'jc/maint-log-first-parent-pathspec' into maintJunio C Hamano2012-02-052-1/+10
| |\ \
| * \ \ Merge branch 'cb/push-quiet' into maintJunio C Hamano2012-02-058-19/+78
| |\ \ \
| * \ \ \ Merge branch 'cb/maint-kill-subprocess-upon-signal' into maintJunio C Hamano2012-02-053-1/+72
| |\ \ \ \
| * \ \ \ \ Sync with 1.7.6.6Junio C Hamano2012-02-052-24/+2
| |\ \ \ \ \
| | * \ \ \ \ Sync with 1.7.6.6Junio C Hamano2012-02-052-24/+2
| | |\ \ \ \ \
| | | * \ \ \ \ Sync with 1.7.6.6Junio C Hamano2012-02-052-24/+2
| | | |\ \ \ \ \
| | | | * | | | | Git 1.7.6.6v1.7.6.6maint-1.7.6Junio C Hamano2012-02-052-2/+3
| | | | * | | | | imap-send: remove dead codeJeff King2012-02-051-23/+0
* | | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-02-011-1/+28
* | | | | | | | | Merge branch 'tr/merge-edit-guidance'Junio C Hamano2012-01-311-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: add instructions to the commit message when editingtr/merge-edit-guidanceThomas Rast2012-01-311-0/+10
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jc/pull-signed-tag'Junio C Hamano2012-01-314-9/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: use editor by default in interactive sessionsJunio C Hamano2012-01-234-9/+50
* | | | | | | | | | Merge branch 'ar/i18n-no-gettext'Junio C Hamano2012-01-312-54/+59
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXTJunio C Hamano2012-01-271-1/+1
| * | | | | | | | | | i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10nJunio C Hamano2012-01-231-0/+1
| * | | | | | | | | | add a Makefile switch to avoid gettext translation in shell scriptsAlex Riesen2012-01-232-2/+9
| * | | | | | | | | | git-sh-i18n: restructure the logic to compute gettext.sh schemeJunio C Hamano2012-01-231-53/+50
* | | | | | | | | | | Merge branch 'nd/clone-detached'Junio C Hamano2012-01-318-159/+254
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: fix up delay cloning conditionsNguyễn Thái Ngọc Duy2012-01-243-12/+15
| * | | | | | | | | | | push: do not let configured foreign-vcs permanently clobberedJunio C Hamano2012-01-231-0/+2
| * | | | | | | | | | | clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-164-16/+20
| * | | | | | | | | | | clone: allow --branch to take a tagNguyễn Thái Ngọc Duy2012-01-164-3/+46
| * | | | | | | | | | | clone: refuse to clone if --branch points to bogus refNguyễn Thái Ngọc Duy2012-01-163-21/+6
| * | | | | | | | | | | clone: --branch=<branch> always means refs/heads/<branch>Nguyễn Thái Ngọc Duy2012-01-161-14/+16
| * | | | | | | | | | | clone: delay cloning until after remote HEAD checkingNguyễn Thái Ngọc Duy2012-01-162-28/+31
| * | | | | | | | | | | clone: factor out remote ref writingNguyễn Thái Ngọc Duy2012-01-161-14/+25
| * | | | | | | | | | | clone: factor out HEAD update codeNguyễn Thái Ngọc Duy2012-01-161-17/+24
| * | | | | | | | | | | clone: factor out checkout codeNguyễn Thái Ngọc Duy2012-01-161-43/+58
| * | | | | | | | | | | clone: write detached HEAD in bare repositoriesNguyễn Thái Ngọc Duy2012-01-162-7/+27
| * | | | | | | | | | | t5601: add missing && cascadeNguyễn Thái Ngọc Duy2012-01-161-3/+3
* | | | | | | | | | | | Merge branch 'da/maint-mergetool-twoway'Junio C Hamano2012-01-312-5/+35
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | mergetool: Provide an empty file when neededda/maint-mergetool-twowayDavid Aguilar2012-01-232-5/+35
* | | | | | | | | | | | | Merge branch 'va/git-p4-branch'Junio C Hamano2012-01-312-9/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t9801: do not overuse test_must_failva/git-p4-branchJunio C Hamano2012-01-261-4/+4
| * | | | | | | | | | | | | git-p4: Change p4 command invocationPete Wyckoff2012-01-261-1/+1
| * | | | | | | | | | | | | git-p4: Add test case for complex branch importVitor Antunes2012-01-261-7/+87
| * | | | | | | | | | | | | git-p4: Search for parent commit on branch creationVitor Antunes2012-01-261-1/+45
* | | | | | | | | | | | | | Merge branch 'jl/submodule-re-add'Junio C Hamano2012-01-312-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | submodule add: fix breakage when re-adding a deep submodulejl/submodule-re-addJens Lehmann2012-01-242-0/+9
* | | | | | | | | | | | | | | Merge branch 'tr/grep-l-with-decoration'Junio C Hamano2012-01-312-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decorationAlbert Yale2012-01-232-2/+25
* | | | | | | | | | | | | | | | Merge branch 'ks/sort-wildcard-in-makefile'Junio C Hamano2012-01-311-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t/Makefile: Use $(sort ...) explicitly where neededks/sort-wildcard-in-makefileKirill Smelkov2012-01-221-3/+3
* | | | | | | | | | | | | | | | | Merge branch 'ld/git-p4-branches-and-labels'Junio C Hamano2012-01-313-35/+205
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
View Lorry Controller Status