summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-05-31git-add: no need for -f when resolving a conflict in already tracked pathLibravatar Jeff King2-1/+13
2009-05-31config.txt: document add.ignore-errorsLibravatar Stephen Boyd1-0/+5
2009-05-31bash: remove always true if statement from __git_ps1()Libravatar SZEDER Gábor1-6/+4
2009-05-31git-apply(1): Clarify that one can select where to apply the patchLibravatar Björn Steinbrink1-1/+1
2009-05-31http-push: reuse existing is_null_refLibravatar Clemens Buchacher1-16/+5
2009-05-30t9139 uses ancient, backwards-compatible iconv namesLibravatar Eric Wong17-93/+91
2009-05-30Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano2-3/+61
2009-05-30Documentation: teach stash/pop workflow instead of stash/applyLibravatar Thomas Rast2-16/+18
2009-05-29Merge branch 'sb/maint-1.6.2-opt-filename-fix'Libravatar Junio C Hamano6-0/+93
2009-05-29Merge branch 'jc/maint-add-p-coalesce-fix'Libravatar Junio C Hamano2-1/+133
2009-05-29Merge branch 'rs/maint-grep-word-regexp-fix'Libravatar Junio C Hamano2-1/+9
2009-05-29t9120: don't expect failure with SVN_HTTPD_PORT unsetLibravatar Stephen Boyd1-11/+6
2009-05-28Documentation: teach stash/pop workflow instead of stash/applyLibravatar Thomas Rast2-16/+18
2009-05-28Merge branch 'maint'Libravatar Junio C Hamano2-4/+14
2009-05-28git-svn: refuse to dcommit non-UTF-8 messagesLibravatar Eric Wong2-3/+61
2009-05-27fix segfault showing an empty remoteLibravatar Clemens Buchacher2-4/+14
2009-05-27t8005: fix typo, it's ISO-8859-5, not KOI8-RLibravatar Brandon Casey1-1/+1
2009-05-27t5500: Modernize test styleLibravatar Stephen Boyd1-127/+149
2009-05-27completion: fix PS1 display during an AM on detached HEADLibravatar Junio C Hamano1-13/+11
2009-05-26imap-send: add support for IPv6Libravatar Benjamin Kramer1-3/+51
2009-05-25Update draft release notes to 1.6.4Libravatar Junio C Hamano1-1/+35
2009-05-25Merge branch 'maint'Libravatar Junio C Hamano6-9/+68
2009-05-25Prepare for 1.6.3.2Libravatar Junio C Hamano2-1/+52
2009-05-25Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maintLibravatar Junio C Hamano1-0/+4
2009-05-25Merge branch 'lt/maint-diff-reduce-lstat' into maintLibravatar Junio C Hamano2-3/+3
2009-05-25Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maintLibravatar Junio C Hamano2-1/+20
2009-05-25Merge branch 'do/maint-merge-recursive-fix' into maintLibravatar Junio C Hamano2-5/+101
2009-05-25Merge branch 'jk/maint-1.6.0-trace-argv' into maintLibravatar Junio C Hamano1-4/+4
2009-05-25Merge branch 'np/push-delta' into maintLibravatar Junio C Hamano3-8/+23
2009-05-25Merge branch 'ar/merge-one-file-diag' into maintLibravatar Junio C Hamano0-0/+0
2009-05-25Merge branch 'ar/unlink-err' into maintLibravatar Junio C Hamano26-50/+68
2009-05-25Merge branch 'jk/maint-add-empty' into maintLibravatar Junio C Hamano1-1/+1
2009-05-25fix cat-file usage message and documentationLibravatar Jeff King2-4/+4
2009-05-25fetch: report ref storage DF errors more accuratelyLibravatar Jeff King1-3/+8
2009-05-25lock_ref: inform callers of unavailable refLibravatar Jeff King1-1/+3
2009-05-25convert bare readlink to strbuf_readlinkLibravatar Jeff King1-7/+4
2009-05-25t3701: ensure correctly set up repository after skipped testsLibravatar Johannes Sixt1-0/+6
2009-05-25merge-options.txt: Clarify merge --squashLibravatar Michael J Gruber1-1/+2
2009-05-25parse-opts: add OPT_FILENAME and transition builtinsLibravatar Stephen Boyd9-33/+59
2009-05-25parse-opts: prepare for OPT_FILENAMELibravatar Stephen Boyd51-64/+86
2009-05-25Merge branch 'jc/mktree' into sb/opt-filenameLibravatar Junio C Hamano7-135/+280
2009-05-25Merge branch 'sb/format-patch-parseopt' into sb/opt-filenameLibravatar Junio C Hamano1-100/+160
2009-05-25Merge branch 'sb/show-branch-parse-options' into sb/opt-filenameLibravatar Junio C Hamano3-71/+84
2009-05-25Merge branch 'master' into sb/opt-filenameLibravatar Junio C Hamano448-6304/+16187
2009-05-24Change xdl_merge to generate output even for null mergesLibravatar Charles Bailey2-17/+16
2009-05-24t6023: merge-file fails to output anything for a degenerate mergeLibravatar Charles Bailey1-0/+6
2009-05-24Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2009-05-24Merge branch 'maint-1.6.2' into maintLibravatar Junio C Hamano1-1/+2
2009-05-24Merge branch 'maint-1.6.1' into maint-1.6.2Libravatar Junio C Hamano1-1/+2
2009-05-24Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-1/+2