summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move t6000lib.sh to lib-*Ævar Arnfjörð Bjarmason2010-05-084-3/+3
* test-lib: Let tests specify commands to be run at end of testJonathan Nieder2010-05-051-1/+27
* Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-054-19/+13
|\
| * remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-054-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-022-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-243-9/+8
* | Merge branch 'maint'Junio C Hamano2010-04-241-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-232-1/+15
|\|
| * Git 1.7.0.6v1.7.0.6Junio C Hamano2010-04-234-3/+17
| * Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maintJunio C Hamano2010-04-231-1/+1
| |\
| * \ Merge branch 'wp/doc-filter-direction' into maintJunio C Hamano2010-04-231-4/+4
| |\ \
| * \ \ Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano2010-04-231-9/+12
| |\ \ \
| * \ \ \ Merge branch 'da/maint-python-startup' into maintJunio C Hamano2010-04-231-3/+2
| |\ \ \ \
* | | | | | Merge branch 'maint'Junio C Hamano2010-04-221-2/+6
|\| | | | |
| * | | | | Documentation/Makefile: fix interrupted builds of user-manual.xmlJonathan Nieder2010-04-221-2/+6
* | | | | | Merge branch 'maint'Junio C Hamano2010-04-203-7/+8
|\| | | | |
| * | | | | t7012: Mark missing tests as TODOMichael J Gruber2010-04-201-6/+6
| * | | | | reflog: remove 'show' from 'expire's usage stringSZEDER Gábor2010-04-201-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-192-2/+9
* | | | | | | Merge branch 'rr/remote-helper-doc'Junio C Hamano2010-04-192-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-191-4/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | documentation: clarify direction of core.autocrlfWill Palmer2010-04-171-4/+4
* | | | | | | | Merge branch 'jk/maint-diffstat-overflow'Junio C Hamano2010-04-191-9/+12
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | diff: use large integers for diffstat calculationsJeff King2010-04-171-9/+12
* | | | | | | | Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'Junio C Hamano2010-04-194-5/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | t3301: add tests to use --format="%N"Junio C Hamano2010-04-181-0/+18
| * | | | | | | | pretty: Initialize notes if %N is usedJohannes Gilger2010-04-143-5/+46
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-191-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Documentation: Describe other situations where -z affects git diffCharles Bailey2010-04-181-2/+2
* | | | | | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2010-04-199-44/+60
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitk: Display dirty submodules correctlyJens Lehmann2010-04-171-8/+21
| * | | | | | | | | gitk: Fix display of copyright symbolPat Thoyts2010-03-209-17/+17
| * | | | | | | | | gitk: Add emacs editor variable blockPat Thoyts2010-03-201-0/+6
| * | | | | | | | | gitk: Avoid calling tk_setPalette on WindowsPat Thoyts2010-03-201-0/+1
| * | | | | | | | | gitk: Don't clobber "Remember this view" settingJonathan Nieder2010-03-201-2/+2