summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge git://repo.or.cz/git-guiv1.7.0-rc2Junio C Hamano2010-02-0734-2514/+3126
|\
| * git-gui: update french translationEmmanuel Trillaud2010-02-021-320/+366
| * git-gui: update Japanese translationNanako Shiraishi2010-02-021-314/+339
| * Merge branch 'maint'Shawn O. Pearce2010-01-291-0/+2
| |\
| | * git-gui: fix shortcut for menu "Commit/Revert Changes"Heiko Voigt2010-01-291-0/+2
| * | git-gui: Quote git path when starting another gui in a submoduleJens Lehmann2010-01-281-1/+1
| * | git-gui: update Italian translationMichele Ballabio2010-01-281-299/+323
| * | git-gui: Update Swedish translation (520t0f0u)Peter Krefting2010-01-281-290/+324
| * | git-gui: use themed tk widgets with Tk 8.5Pat Thoyts2010-01-2726-453/+697
| * | git-gui: Update German translation (12 new or changed strings).Christian Stimming2010-01-271-398/+426
| * | git-gui: Update translation templateShawn O. Pearce2010-01-261-282/+302
| * | git-gui: Remove unused icon file_parttickShawn O. Pearce2010-01-251-9/+0
| * | git-gui: use different icon for new and modified files in the indexPeter Oberndorfer2010-01-251-1/+1
| * | git-gui: set GIT_DIR and GIT_WORK_TREE after setupGiuseppe Bilotta2010-01-231-23/+20
| * | git-gui: update shortcut tools to use _gitworktreeGiuseppe Bilotta2010-01-231-3/+4
| * | git-gui: handle bare repos correctlyGiuseppe Bilotta2010-01-231-7/+36
| * | git-gui: handle non-standard worktree locationsGiuseppe Bilotta2010-01-231-9/+28
| * | git-gui: Support applying a range of changes at onceJeff Epler2010-01-232-104/+153
| * | git-gui: Add a special diff popup menu for submodulesJens Lehmann2010-01-231-16/+110
| * | git-gui: Use git diff --submodule when availableJens Lehmann2010-01-231-4/+13
| |/
* | Merge branch 'maint'Junio C Hamano2010-02-072-18/+26
|\ \
| * | archive: simplify archive format guessingRené Scharfe2010-02-072-18/+26
* | | Fix invalid read in quote_c_style_countedJeff King2010-02-062-2/+21
* | | docs: fix filter-branch example for quoted pathsJeff King2010-02-061-1/+1
* | | t9501: Re-fix max load testBrian Gernhardt2010-02-061-9/+2
* | | bash: support the --autosquash option for rebaseBjörn Gustavsson2010-02-061-0/+1
* | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2010-02-051-1/+1
|\ \ \
| * | | gitk: Fix copyright symbol in About box messagePaul Mackerras2010-02-041-1/+1
* | | | t9501: Skip testing load if we can't detect itBrian Gernhardt2010-02-051-1/+8
* | | | Update draft release notes to 1.7.0Junio C Hamano2010-02-051-1/+6
* | | | Merge branch 'maint'Junio C Hamano2010-02-051-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Update git fsck --full short description to mention packsWesley J. Landaker2010-02-051-1/+1
| * | | Merge branch 'jc/maint-limit-note-output' into maintJunio C Hamano2010-02-058-1/+85
| |\ \ \
* | | | | Revert 30816237 and 7e62265Junio C Hamano2010-02-054-96/+1
* | | | | git-svn: persistent memoizationAndrew Myrick2010-02-041-4/+36
* | | | | fast-import: count --max-pack-size in bytesJunio C Hamano2010-02-043-12/+17
* | | | | update git-repack documentation wrt repack.UseDeltaBaseOffsetNicolas Pitre2010-02-041-9/+9
* | | | | git-clean: fix the description of the default behaviorMichael J Gruber2010-02-042-4/+4
* | | | | fast-import.c: Fix big-file-threshold parsing bugJunio C Hamano2010-02-041-1/+4
* | | | | make --max-pack-size argument to 'git pack-object' count in bytesNicolas Pitre2010-02-036-21/+36
* | | | | pack-objects: fix pack generation when using pack_size_limitNicolas Pitre2010-02-031-24/+13
* | | | | fix multiple issues with t5300Nicolas Pitre2010-02-031-20/+34
* | | | | gitweb: Simplify (and fix) chop_strJohn 'Warthog9' Hawley2010-02-031-4/+0
* | | | | grep: simplify assignment of ->fixedRené Scharfe2010-02-031-4/+1
* | | | | Merge branch 'ms/filter-branch-submodule'Junio C Hamano2010-02-022-1/+40
|\ \ \ \ \
| * | | | | filter-branch: Add tests for submodules in tree-filterMichal Sojka2010-01-281-0/+39
| * | | | | filter-branch: Fix to allow replacing submodules with another contentMichal Sojka2010-01-281-1/+1
* | | | | | Merge branch 'jh/gitweb-caching' (early part)Junio C Hamano2010-02-026-76/+248
|\ \ \ \ \ \
| * | | | | | gitweb: Add optional extra parameter to die_error, for extended explanationJohn 'Warthog9' Hawley2010-01-301-1/+7
| * | | | | | gitweb: add a "string" variant of print_sort_thJohn 'Warthog9' Hawley2010-01-301-5/+12