summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | test-lib: allow negation of prerequisitesJeff King2012-11-152-1/+52
* | | | | | | | | | | | | | | Merge branch 'fc/send-email-no-sender-prompt'Junio C Hamano2012-11-292-9/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | send-email: avoid questions when user has an identFelipe Contreras2012-11-262-9/+3
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'er/doc-add-new-commands'Junio C Hamano2012-11-291-0/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Documentation: how to add a new commandEric S. Raymond2012-11-261-0/+99
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jl/submodule-rm'Junio C Hamano2012-11-292-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Teach rm to remove submodules when given with a trailing '/'Jens Lehmann2012-11-232-0/+32
* | | | | | | | | | | | | | | Merge branch 'pp/gitweb-config-underscore'Junio C Hamano2012-11-291-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gitweb: make remote_heads config setting workPhil Pennock2012-11-211-2/+5
* | | | | | | | | | | | | | | | Merge branch 'fc/completion-test-simplification'Junio C Hamano2012-11-291-82/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | completion: simplify __gitcomp() test helperFelipe Contreras2012-11-161-10/+5
| * | | | | | | | | | | | | | | | completion: refactor __gitcomp related testsFelipe Contreras2012-11-161-50/+28
| * | | | | | | | | | | | | | | | completion: consolidate test_completion*() testsFelipe Contreras2012-11-161-17/+14
| * | | | | | | | | | | | | | | | completion: simplify tests using test_completion_long()Felipe Contreras2012-11-161-6/+3
| * | | | | | | | | | | | | | | | completion: standardize final space marker in testsFelipe Contreras2012-11-161-14/+13
| * | | | | | | | | | | | | | | | completion: add comment for test_completion()Felipe Contreras2012-11-161-1/+5
* | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-11-293-5/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | git-fast-import.txt: improve documentation for quoted pathsMatthieu Moy2012-11-291-2/+6
| * | | | | | | | | | | | | | | | git-remote-mediawiki: escape ", \, and LF in file namesMatthieu Moy2012-11-292-3/+39
* | | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2012-11-291-834/+896
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://github.com/vnwildman/gitJiang Xin2012-11-291-834/+896
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | l10n: vi.po: Update follow git-v1.8.0-273-g2d242Tran Ngoc Quan2012-11-241-834/+896
* | | | | | | | | | | | | | | | | | | completion: fix warning for zshFelipe Contreras2012-11-291-0/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2012-11-283-1970/+2097
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | l10n: Update Swedish translation (1975t0f0u)Peter Krefting2012-11-231-589/+657
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | l10n: vi.po: update to git-v1.7.12-437-g1084fTran Ngoc Quan2012-11-231-798/+799
| * | | | | | | | | | | | | | | | | l10n: Update git.pot (14 new, 3 removed messages)Jiang Xin2012-11-231-583/+641
* | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-11-282-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Start preparing for 1.8.0.2Junio C Hamano2012-11-282-1/+16
| * | | | | | | | | | | | | | | | | Merge branch 'rh/maint-gitweb-highlight-ext' into maintJunio C Hamano2012-11-281-9/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/maint-p4-rcs-expansion-newline' into maintJunio C Hamano2012-11-282-1/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | completion: add options --single-branch and --branch to "git clone"Ralf Thielow2012-11-281-0/+2
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.1Junio C Hamano2012-11-281-1/+10
* | | | | | | | | | | | | | | | | | | Merge branch 'fc/zsh-completion'Junio C Hamano2012-11-282-43/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | completion: start moving to the new zsh completionFelipe Contreras2012-11-191-43/+61
| * | | | | | | | | | | | | | | | | | | completion: add new zsh completionFelipe Contreras2012-11-191-0/+78
* | | | | | | | | | | | | | | | | | | | Merge branch 'mm/status-push-pull-advise'Junio C Hamano2012-11-282-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | status: add advice on how to push/pull to tracking branchMatthieu Moy2012-11-162-3/+11
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pickaxe-textconv'Junio C Hamano2012-11-282-19/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | pickaxe: use textconv for -S countingJeff King2012-10-282-17/+51
| * | | | | | | | | | | | | | | | | | | | pickaxe: hoist empty needle checkJeff King2012-10-281-2/+3
* | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-11-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'nd/maint-compat-fnmatch-fix' into maintJunio C Hamano2012-11-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/update-ref-d-through-symref' into maintJunio C Hamano2012-11-272-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'esr/maint-doc-fast-import' into maintJunio C Hamano2012-11-271-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'wtk/submodule-doc-fixup' into maintJunio C Hamano2012-11-272-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Documentation: improve phrasing in git-push.txtMark Szepieniec2012-11-271-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-11-262-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix typo in remote set-head usageAntoine Pelisse2012-11-261-1/+1
| * | | | | | | | | | | | | | | | | | | | | | Makefile: hide stderr of curl-config testPaul Gortmaker2012-11-261-1/+1