summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/cached-textconv'Junio C Hamano2010-05-0814-118/+403
|\
| * diff: avoid useless filespec populationJeff King2010-04-021-5/+4
| * diff: cache textconv outputJeff King2010-04-025-9/+185
| * textconv: refactor calls to run_textconvJeff King2010-04-021-36/+30
| * introduce notes-cache interfaceJeff King2010-04-013-0/+116
| * make commit_tree a library functionJeff King2010-04-016-72/+72
* | Merge branch 'pc/remove-warn'Junio C Hamano2010-05-086-21/+68
|\ \
| * | Remove a redundant errno test in a usage of remove_pathPeter Collingbourne2010-03-281-1/+1
| * | Introduce remove_or_warn functionPeter Collingbourne2010-03-285-15/+51
| * | Implement the rmdir_or_warn functionPeter Collingbourne2010-03-282-0/+9
| * | Generalise the unlink_or_warn functionPeter Collingbourne2010-03-281-5/+7
* | | cherry-pick: do not dump core when iconv failsJonathan Nieder2010-05-081-2/+7
* | | Makefile: Fix 'clean' target to remove all gitweb build filesRamsay Jones2010-05-081-1/+1
* | | Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRefLeif Arne Storset2010-05-071-4/+4
* | | test-lib: some shells do not let $? propagate into an evalJonathan Nieder2010-05-062-3/+25
* | | test-lib: Let tests specify commands to be run at end of testJonathan Nieder2010-05-041-1/+27
* | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-044-19/+13
|\ \ \
| * | | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-044-19/+13
* | | | Documentation/git-send-email: Add "Use gmail as the smtp server"Ping Yin2010-05-041-0/+15
* | | | clone: quell the progress report from init and report on cloneJunio C Hamano2010-05-042-2/+6
* | | | test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.Michal Sojka2010-05-041-0/+12
* | | | Gitweb: ignore built fileSverre Rabbelier2010-05-021-0/+1
* | | | Merge branch 'maint'Junio C Hamano2010-05-012-1/+3
|\ \ \ \ | |/ / /
| * | | index-pack: fix trivial typo in usage stringMichael J Gruber2010-05-011-1/+1
| * | | git-submodule.sh: properly initialize shell variablesGerrit Pape2010-05-011-0/+2
* | | | xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin2010-05-011-9/+8
* | | | Git 1.7.1v1.7.1Junio C Hamano2010-04-233-9/+8
* | | | Merge branch 'maint'Junio C Hamano2010-04-231-9/+34
|\ \ \ \ | |/ / /
| * | | Documentation improvements for the description of short format.Eric Raymond2010-04-231-9/+34
* | | | Sync with 1.7.0.6Junio C Hamano2010-04-222-1/+15
|\ \ \ \ | |/ / /
| * | | Git 1.7.0.6v1.7.0.6Junio C Hamano2010-04-224-3/+17
| * | | Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maintJunio C Hamano2010-04-221-1/+1
| |\ \ \
| * \ \ \ Merge branch 'wp/doc-filter-direction' into maintJunio C Hamano2010-04-221-4/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano2010-04-221-9/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'da/maint-python-startup' into maintJunio C Hamano2010-04-221-3/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2010-04-211-2/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Documentation/Makefile: fix interrupted builds of user-manual.xmlJonathan Nieder2010-04-211-2/+6
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-193-7/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | t7012: Mark missing tests as TODOMichael J Gruber2010-04-191-6/+6
| * | | | | | | reflog: remove 'show' from 'expire's usage stringSZEDER Gábor2010-04-191-1/+1
| * | | | | | | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-04-191-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | MSVC: Fix build by adding missing termios.h dummyJohannes Sixt2010-04-191-0/+1
* | | | | | | | | Git 1.7.1-rc2v1.7.1-rc2Junio C Hamano2010-04-182-2/+9
* | | | | | | | | Merge branch 'rr/remote-helper-doc'Junio C Hamano2010-04-182-58/+119
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/remote-helpers: Fix typos and improve languageRamkumar Ramachandra2010-04-181-28/+23
| * | | | | | | | | Fixup: Second argument may be any arbitrary stringRamkumar Ramachandra2010-04-181-3/+2
| * | | | | | | | | Documentation/remote-helpers: Add invocation sectionRamkumar Ramachandra2010-04-181-1/+34
| * | | | | | | | | Documentation/urls: Rewrite to accomodate <transport>::<address>Ramkumar Ramachandra2010-04-181-23/+36
| * | | | | | | | | Documentation/remote-helpers: Rewrite descriptionRamkumar Ramachandra2010-04-181-6/+27
* | | | | | | | | | Merge branch 'wp/doc-filter-direction'Junio C Hamano2010-04-181-4/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |