summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gitweb test: fix highlight test hang on Linux Mintrj/highlight-test-hangRamsay Jones2013-10-141-2/+4
* gitweb: Refactor syntax highlighting supportJakub Narebski2010-05-032-53/+92
* gitweb: Syntax highlighting supportJohannes Schindelin2010-05-032-1/+82
* 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
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | documentation: clarify direction of core.autocrlfWill Palmer2010-04-171-4/+4
* | | | | | | | Merge branch 'jk/maint-diffstat-overflow'Junio C Hamano2010-04-181-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-184-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-133-5/+46
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-181-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-189-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
| * | | | | | | | | gitk: Add comments to explain encode_view_opts and decode_view_optsJonathan Nieder2010-03-201-0/+2
| * | | | | | | | | gitk: Use consistent font for all text input fieldsMark Hills2010-03-201-4/+5
| * | | | | | | | | gitk: Set the font for all listbox widgetsMark Hills2010-03-201-0/+1
| * | | | | | | | | gitk: Set the font for all spinbox widgetsMark Hills2010-03-201-1/+2
| * | | | | | | | | gitk: Remove forced use of sans-serif fontMark Hills2010-03-201-12/+0