summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* revision: Turn off history simplification in --ancestry-path modeJohan Herland2010-06-062-0/+18
* revision: Fix typo in --ancestry-path error messageJohan Herland2010-06-061-1/+1
* Documentation/rev-list-options.txt: Explain --ancestry-pathJohan Herland2010-06-061-2/+48
* Documentation/rev-list-options.txt: Fix missing line in example history graphJohan Herland2010-06-061-1/+1
* revision: --ancestry-pathJunio C Hamano2010-04-213-0/+159
* 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
| * | | | | | | gitk: Add Ctrl-W shortcut for closing the active windowJens Lehmann2010-03-201-0/+3
* | | | | | | | rebase-interactive: silence warning when no commits rewrittenJeff King2010-04-181-0/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-174-13/+23
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | t1010-mktree: Adjust expected result to code and documentationMichael J Gruber2010-04-171-6/+4
| * | | | | | | combined diff: correctly handle truncated fileThomas Rast2010-04-172-6/+16
| * | | | | | | Document new "already-merged" rule for branch -dJonathan Nieder2010-04-151-1/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | t6006: do not write to /tmpMatthew Ogilvie2010-04-171-1/+1
* | | | | | | git-instaweb: pass through invoking user's path to gitweb CGI scriptsChris Webb2010-04-171-2/+2
* | | | | | | gitweb: simplify gitweb.min.* generation and clean-up rulesJunio C Hamano2010-04-171-37/+38
* | | | | | | tag -v: use RUN_GIT_CMD to run verify-tagJonathan Nieder2010-04-171-2/+2
* | | | | | | Add .depend directories to .gitignoreJonathan Nieder2010-04-151-1/+1
* | | | | | | Merge branch 'maint'Junio C Hamano2010-04-133-7/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Documentation/config.txt: default gc.aggressiveWindow is 250, not 10Jay Soffian2010-04-131-1/+1