summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintJunio C Hamano2010-02-102-1/+58
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/maint-archive-match-pathspec' into maintJunio C Hamano2010-02-101-1/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | check-ref-format documentation: fix enumeration mark-upJunio C Hamano2010-02-101-1/+1
* | | | | | | | | | | | | | | Documentation: quote braces in {upstream} notationThomas Rast2010-02-101-1/+1
* | | | | | | | | | | | | | | t3902: Protect against OS X normalizationBrian Gernhardt2010-02-081-4/+4
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-085-14/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-02-082-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | blame: prevent a segv when -L given start > EOFJay Soffian2010-02-082-1/+9
| | * | | | | | | | | | | | | Merge branch 'sb/maint-octopus' into maint-1.6.5Junio C Hamano2010-02-012-9/+57
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/maint-add-all-doc' into maint-1.6.5Junio C Hamano2010-02-012-29/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-push-doc-status' into maintJunio C Hamano2010-02-081-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | git-push: document all the status flags used in the outputJunio C Hamano2010-02-081-5/+10
| * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-imap-config-parse' into maintJunio C Hamano2010-02-081-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Fix parsing of imap.preformattedHTML and imap.sslverifyJunio C Hamano2010-02-081-7/+8
| * | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-doc-git-add-example' into maintJunio C Hamano2010-02-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | git-add documentation: Fix shell quoting exampleJunio C Hamano2010-02-081-1/+1
* | | | | | | | | | | | | | | | | | | | Revert "pack-objects: fix pack generation when using pack_size_limit"Nicolas Pitre2010-02-082-12/+10
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \