summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-06-02Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maintLibravatar Junio C Hamano6-0/+93
2009-06-02Merge branch 'jc/maint-add-p-coalesce-fix' into maintLibravatar Junio C Hamano2-1/+133
2009-06-02Merge branch 'tr/maint-doc-stash-pop' into maintLibravatar Junio C Hamano2-16/+18
2009-06-01grep: fix colouring of matches with zero lengthLibravatar René Scharfe1-0/+2
2009-06-01refuse to merge during a mergeLibravatar Clemens Buchacher2-1/+7
2009-05-28for-each-ref: Do not lookup objects when they will not be usedLibravatar Anders Kaseorg1-9/+17
2009-05-28Documentation: teach stash/pop workflow instead of stash/applyLibravatar Thomas Rast2-16/+18
2009-05-27fix segfault showing an empty remoteLibravatar Clemens Buchacher2-4/+14
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-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-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-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
2009-05-24http-push.c::remove_locks(): fix use after freeLibravatar Alex Riesen1-1/+2
2009-05-23grep: fix word-regexp at the beginning of linesLibravatar René Scharfe2-1/+9
2009-05-23apply, fmt-merge-msg: use relative filenamesLibravatar Stephen Boyd4-0/+79
2009-05-23commit: -F overrides -tLibravatar Stephen Boyd2-0/+14
2009-05-20grep: fix word-regexp colouringLibravatar René Scharfe1-0/+5
2009-05-20completion: use git rev-parse to detect bare reposLibravatar Giuseppe Bilotta1-1/+1
2009-05-20Cope better with a _lot_ of packsLibravatar Johannes Schindelin1-0/+6
2009-05-20for-each-ref: fix segfault in copy_emailLibravatar Jeff King1-2/+5
2009-05-17show-branch: Fix die message in parse_reflog_param()Libravatar Stephen Boyd1-1/+1
2009-05-16completion: add missing options to show-branch and showLibravatar Stephen Boyd1-2/+2
2009-05-16dir.c: clean up handling of 'path' parameter in read_directory_recursive()Libravatar Linus Torvalds1-1/+1
2009-05-16Fix type-punning issuesLibravatar Dan McGee2-2/+5
2009-05-16test: checkout shouldn't say that HEAD has moved if it didn'tLibravatar Nanako Shiraishi1-0/+8
2009-05-16completion: enhance "current branch" displayLibravatar Junio C Hamano1-2/+13
2009-05-16completion: simplify "current branch" in __git_ps1()Libravatar Junio C Hamano1-7/+8
2009-05-16completion: fix PS1 display during a merge on detached HEADLibravatar Junio C Hamano1-3/+3
2009-05-16Revert "git-add--interactive: remove hunk coalescing"Libravatar Junio C Hamano2-2/+96
2009-05-16Splitting a hunk that adds a line at the top fails in "add -p"Libravatar Matt Graham1-0/+32
2009-05-16builtin-checkout: Don't tell user that HEAD has moved before it hasLibravatar Daniel Cordero1-8/+8
2009-05-16pre-commit.sample: don't print incidental SHA1Libravatar Jim Meyering1-1/+1
2009-05-16tests: Add tests for missing format-patch long optionsLibravatar Stephen Boyd2-0/+17
2009-05-16api-parse-options.txt: use 'func' instead of 'funct'Libravatar Stephen Boyd1-1/+1