summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation: exclude irrelevant options from "git pull"jc/maint-pull-docfix-for-409b8d82Junio C Hamano2014-01-141-2/+2
* Documentation/git-pull: put verbosity options before merge/fetch onesTay Ray Chuan2010-02-242-0/+10
* Documentation/git-clone: mention progress in -vTay Ray Chuan2010-02-241-1/+2
* Git 1.7.0v1.7.0Junio C Hamano2010-02-123-1/+11
* Merge branch 'maint'Junio C Hamano2010-02-122-2/+2
|\
| * Fix typo in 1.6.6.2 release notesJunio C Hamano2010-02-121-1/+1
| * Re-fix check-ref-format documentation mark-upJunio C Hamano2010-02-121-1/+1
* | archive documentation: attributes are taken from the tree by defaultJunio C Hamano2010-02-121-0/+8
* | Documentation: minor fixes to RelNotes-1.7.0Michael J Gruber2010-02-121-8/+8
* | bash: support 'git am's new '--continue' optionSZEDER Gábor2010-02-121-1/+1
* | Merge branch 'maint'Junio C Hamano2010-02-111-1/+1
|\ \ | |/
| * filter-branch: Fix error message for --prune-empty --commit-filterJacob Helwig2010-02-111-1/+1
* | am: switch --resolved to --continueJeff King2010-02-112-3/+5
* | Update draft release notes to 1.7.0 one more timeJunio C Hamano2010-02-101-15/+1
* | Sync with 1.6.6.2Junio C Hamano2010-02-104-4/+53
|\ \ | |/
| * Git 1.6.6.2v1.6.6.2Junio C Hamano2010-02-104-3/+50
| * Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-02-101-2/+4
| |\
| | * t8003: check exit code of command and error message separatelyJunio C Hamano2010-02-101-2/+4
| * | Merge branch 'sp/maint-fast-import-large-blob' into maintJunio C Hamano2010-02-105-20/+227
| |\ \
| * \ \ Merge branch 'gp/maint-cvsserver' into maintJunio C Hamano2010-02-101-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano2010-02-104-10/+86
| |\ \ \ \
| * \ \ \ \ Merge branch 'il/maint-xmallocz' into maintJunio C Hamano2010-02-104-10/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jh/maint-config-file-prefix' into maintJunio C Hamano2010-02-102-1/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/include-termios-for-osol' into maintJunio C Hamano2010-02-101-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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