summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-06merge: make branch.<name>.mergeoptions correctly override merge.<option>Libravatar Junio C Hamano2-14/+57
2010-02-12Git 1.7.0Libravatar Junio C Hamano3-1/+11
2010-02-12Merge branch 'maint'Libravatar Junio C Hamano2-2/+2
2010-02-12Fix typo in 1.6.6.2 release notesLibravatar Junio C Hamano1-1/+1
2010-02-12Re-fix check-ref-format documentation mark-upLibravatar Junio C Hamano1-1/+1
2010-02-12archive documentation: attributes are taken from the tree by defaultLibravatar Junio C Hamano1-0/+8
2010-02-12Documentation: minor fixes to RelNotes-1.7.0Libravatar Michael J Gruber1-8/+8
2010-02-12bash: support 'git am's new '--continue' optionLibravatar SZEDER Gábor1-1/+1
2010-02-11Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-02-11filter-branch: Fix error message for --prune-empty --commit-filterLibravatar Jacob Helwig1-1/+1
2010-02-11am: switch --resolved to --continueLibravatar Jeff King2-3/+5
2010-02-10Update draft release notes to 1.7.0 one more timeLibravatar Junio C Hamano1-15/+1
2010-02-10Sync with 1.6.6.2Libravatar Junio C Hamano4-4/+53
2010-02-10Git 1.6.6.2Libravatar Junio C Hamano4-3/+50
2010-02-10Merge branch 'maint-1.6.5' into maintLibravatar Junio C Hamano1-2/+4
2010-02-10t8003: check exit code of command and error message separatelyLibravatar Junio C Hamano1-2/+4
2010-02-10Merge branch 'sp/maint-fast-import-large-blob' into maintLibravatar Junio C Hamano5-20/+227
2010-02-10Merge branch 'gp/maint-cvsserver' into maintLibravatar Junio C Hamano1-1/+1
2010-02-10Merge branch 'jc/maint-reflog-bad-timestamp' into maintLibravatar Junio C Hamano4-10/+86
2010-02-10Merge branch 'il/maint-xmallocz' into maintLibravatar Junio C Hamano4-10/+15
2010-02-10Merge branch 'jh/maint-config-file-prefix' into maintLibravatar Junio C Hamano2-1/+12
2010-02-10Merge branch 'nd/include-termios-for-osol' into maintLibravatar Junio C Hamano1-0/+1
2010-02-10Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintLibravatar Junio C Hamano2-1/+58
2010-02-10Merge branch 'rs/maint-archive-match-pathspec' into maintLibravatar Junio C Hamano1-1/+24
2010-02-10check-ref-format documentation: fix enumeration mark-upLibravatar Junio C Hamano1-1/+1
2010-02-10Documentation: quote braces in {upstream} notationLibravatar Thomas Rast1-1/+1
2010-02-08t3902: Protect against OS X normalizationLibravatar Brian Gernhardt1-4/+4
2010-02-08Merge branch 'maint'Libravatar Junio C Hamano5-14/+28
2010-02-08Merge branch 'maint-1.6.5' into maintLibravatar Junio C Hamano2-1/+9
2010-02-08blame: prevent a segv when -L given start > EOFLibravatar Jay Soffian2-1/+9
2010-02-08Merge branch 'jc/maint-push-doc-status' into maintLibravatar Junio C Hamano1-5/+10
2010-02-08git-push: document all the status flags used in the outputLibravatar Junio C Hamano1-5/+10
2010-02-08Merge branch 'jc/maint-imap-config-parse' into maintLibravatar Junio C Hamano1-7/+8
2010-02-08Fix parsing of imap.preformattedHTML and imap.sslverifyLibravatar Junio C Hamano1-7/+8
2010-02-08Merge branch 'jc/maint-doc-git-add-example' into maintLibravatar Junio C Hamano1-1/+1
2010-02-08git-add documentation: Fix shell quoting exampleLibravatar Junio C Hamano1-1/+1
2010-02-08Revert "pack-objects: fix pack generation when using pack_size_limit"Libravatar Nicolas Pitre2-12/+10
2010-02-07Merge git://repo.or.cz/git-guiLibravatar Junio C Hamano34-2514/+3126
2010-02-07Merge branch 'maint'Libravatar Junio C Hamano2-18/+26
2010-02-07archive: simplify archive format guessingLibravatar René Scharfe2-18/+26
2010-02-06Fix invalid read in quote_c_style_countedLibravatar Jeff King2-2/+21
2010-02-06docs: fix filter-branch example for quoted pathsLibravatar Jeff King1-1/+1
2010-02-06t9501: Re-fix max load testLibravatar Brian Gernhardt1-9/+2
2010-02-06bash: support the --autosquash option for rebaseLibravatar Björn Gustavsson1-0/+1
2010-02-05Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-1/+1
2010-02-05t9501: Skip testing load if we can't detect itLibravatar Brian Gernhardt1-1/+8
2010-02-05Update draft release notes to 1.7.0Libravatar Junio C Hamano1-1/+6
2010-02-05Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-02-05Update git fsck --full short description to mention packsLibravatar Wesley J. Landaker1-1/+1
2010-02-05Merge branch 'jc/maint-limit-note-output' into maintLibravatar Junio C Hamano8-1/+85