summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | fast-import: Stream very large blobs directly to packShawn O. Pearce2010-02-015-20/+227
* | | Merge branch 'gp/maint-cvsserver' into maintJunio C Hamano2010-02-101-1/+1
|\ \ \
| * | | git-cvsserver: allow regex metacharacters in CVSROOTGerrit Pape2010-01-261-1/+1
* | | | Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano2010-02-104-10/+86
|\ \ \ \
| * | | | t0101: use a fixed timestamp when searching in the reflogJunio C Hamano2010-01-271-2/+2
| * | | | Update @{bogus.timestamp} fix not to die()Junio C Hamano2010-01-271-2/+2
| * | | | approxidate_careful() reports errorneous date stringJunio C Hamano2010-01-264-10/+86
| |/ / /
* | | | Merge branch 'il/maint-xmallocz' into maintJunio C Hamano2010-02-104-10/+15
|\ \ \ \
| * | | | Fix integer overflow in unpack_compressed_entry()Ilari Liusvaara2010-01-261-2/+1
| * | | | Fix integer overflow in unpack_sha1_rest()Ilari Liusvaara2010-01-261-2/+1
| * | | | Fix integer overflow in patch_delta()Ilari Liusvaara2010-01-261-2/+1
| * | | | Add xmallocz()Ilari Liusvaara2010-01-262-4/+12
| |/ / /
* | | | Merge branch 'jh/maint-config-file-prefix' into maintJunio C Hamano2010-02-102-1/+12
|\ \ \ \
| * | | | builtin-config: Fix crash when using "-f <relative path>" from non-root dirJohan Herland2010-01-262-1/+12
* | | | | Merge branch 'nd/include-termios-for-osol' into maintJunio C Hamano2010-02-101-0/+1
|\ \ \ \ \
| * | | | | Add missing #include to support TIOCGWINSZ on SolarisNguyễn Thái Ngọc Duy2010-01-111-0/+1
* | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintJunio C Hamano2010-02-102-1/+58
|\ \ \ \ \ \
| * | | | | | checkout -m path: fix recreating conflictsJunio C Hamano2010-01-062-1/+58
* | | | | | | Merge branch 'rs/maint-archive-match-pathspec' into maintJunio C Hamano2010-02-101-1/+24
|\ \ \ \ \ \ \
| * | | | | | | archive: complain about path specs that don't match anythingRené Scharfe2009-12-301-1/+24
| | |/ / / / / | |/| | | | |
* | | | | | | check-ref-format documentation: fix enumeration mark-upJunio C Hamano2010-02-101-1/+1
* | | | | | | 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
* | | | | | | | | | | | archive: simplify archive format guessingRené Scharfe2010-02-072-18/+26
* | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix "log --oneline" not to show notesJunio C Hamano2010-01-213-4/+7
| * | | | | | | | | | | | Fix "log" family not to be too agressive about showing notesJunio C Hamano2010-01-208-1/+82
* | | | | | | | | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | fix memcpy of overlapping areaJeff King2010-01-291-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | bash: don't offer remote transport helpers as subcommandsSZEDER Gábor2010-01-281-0/+1
* | | | | | | | | | | Merge branch 'maint' of git://git.spearce.org/git-gui into maintJunio C Hamano2010-01-245-23/+48
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-gui: work from the .git dirGiuseppe Bilotta2010-01-231-0/+10
| * | | | | | | | | | | git-gui: Fix applying a line when all following lines are deletionsJeff Epler2010-01-231-0/+1
| * | | | | | | | | | | git-gui: Correct file_states when unstaging partly staged entryJens Lehmann2010-01-231-0/+3
| * | | | | | | | | | | git-gui: Fix gitk for branch whose name matches local filePeter Krefting2010-01-231-1/+1
| * | | | | | | | | | | git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in syncChristopher Beelby2010-01-231-0/+4
| * | | | | | | | | | | git-gui: handle really long error messages in updateindex.Pat Thoyts2010-01-231-16/+18