18660 Commits (6c7f58d6f691c1091b90b0891e94c91e20fd6054)
 

Author SHA1 Message Date
Junio C Hamano 6c7f58d6f6 GIT 1.6.3.2 16 years ago
René Scharfe 84201eae77 grep: fix empty word-regexp matches 16 years ago
Junio C Hamano a9b2d42486 blame: correctly handle a path that used to be a directory 16 years ago
Thomas Rast 8dc3a47c3e add -i: do not dump patch during application 16 years ago
Junio C Hamano 40bad52d7d Update draft release notes for 1.6.3.2 16 years ago
Junio C Hamano 456cb4cf3e Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint 16 years ago
Junio C Hamano 3489428367 Merge branch 'rs/maint-grep-word-regexp-fix' into maint 16 years ago
Junio C Hamano b91ffd37d5 Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint 16 years ago
Junio C Hamano f2823263bd Merge branch 'jc/maint-add-p-coalesce-fix' into maint 16 years ago
Junio C Hamano db8af4b5ea Merge branch 'tr/maint-doc-stash-pop' into maint 16 years ago
René Scharfe 1f5b9cc40e grep: fix colouring of matches with zero length 16 years ago
Thomas Rast 7b8988e113 Documentation: teach stash/pop workflow instead of stash/apply 16 years ago
Clemens Buchacher 6a01554e63 fix segfault showing an empty remote 16 years ago
Junio C Hamano e57cb01582 Prepare for 1.6.3.2 16 years ago
Junio C Hamano 2a1feb92ee Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maint 16 years ago
Junio C Hamano 5e04a1ee33 Merge branch 'lt/maint-diff-reduce-lstat' into maint 16 years ago
Junio C Hamano 597a178246 Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint 16 years ago
Junio C Hamano 5c44cc9ea2 Merge branch 'do/maint-merge-recursive-fix' into maint 16 years ago
Junio C Hamano 417653777a Merge branch 'jk/maint-1.6.0-trace-argv' into maint 16 years ago
Junio C Hamano 4619136c8b Merge branch 'np/push-delta' into maint 16 years ago
Junio C Hamano e82f625416 Merge branch 'ar/merge-one-file-diag' into maint 16 years ago
Junio C Hamano 2c5942dbae Merge branch 'ar/unlink-err' into maint 16 years ago
Junio C Hamano 43f8f560c0 Merge branch 'jk/maint-add-empty' into maint 16 years ago
Jeff King 0e5168fd18 fix cat-file usage message and documentation 16 years ago
Jeff King fa25075979 fetch: report ref storage DF errors more accurately 16 years ago
Jeff King f475e08edb lock_ref: inform callers of unavailable ref 16 years ago
Johannes Sixt 32a90233d1 t3701: ensure correctly set up repository after skipped tests 16 years ago
Michael J Gruber f5d4c4d0f1 merge-options.txt: Clarify merge --squash 16 years ago
Charles Bailey 5719db91ce Change xdl_merge to generate output even for null merges 16 years ago
Charles Bailey 1cd12926ce t6023: merge-file fails to output anything for a degenerate merge 16 years ago
Junio C Hamano f5b223abfd Merge branch 'maint-1.6.2' into maint 16 years ago
Junio C Hamano 34ab57df97 Merge branch 'maint-1.6.1' into maint-1.6.2 16 years ago
Junio C Hamano ff6e93fe60 Merge branch 'maint-1.6.0' into maint-1.6.1 16 years ago
Alex Riesen 6589ebf107 http-push.c::remove_locks(): fix use after free 16 years ago
René Scharfe dbb6a4ada6 grep: fix word-regexp at the beginning of lines 16 years ago
Stephen Boyd 4c8d4c14c6 apply, fmt-merge-msg: use relative filenames 16 years ago
Stephen Boyd aae94ffbc1 commit: -F overrides -t 16 years ago
René Scharfe e701fadb9e grep: fix word-regexp colouring 16 years ago
Giuseppe Bilotta 8dfb17e1fd completion: use git rev-parse to detect bare repos 16 years ago
Johannes Schindelin fd73ccf279 Cope better with a _lot_ of packs 16 years ago
Jeff King e64c1b0053 for-each-ref: fix segfault in copy_email 16 years ago
Stephen Boyd 5acb3e5012 show-branch: Fix die message in parse_reflog_param() 16 years ago
Stephen Boyd 076c32370d completion: add missing options to show-branch and show 16 years ago
Linus Torvalds da4b3e8c28 dir.c: clean up handling of 'path' parameter in read_directory_recursive() 16 years ago
Dan McGee b867d324ce Fix type-punning issues 16 years ago
Nanako Shiraishi e4b09dad9f test: checkout shouldn't say that HEAD has moved if it didn't 16 years ago
Junio C Hamano dd42c2f015 completion: enhance "current branch" display 16 years ago
Junio C Hamano ff790b6a4b completion: simplify "current branch" in __git_ps1() 16 years ago
Junio C Hamano 8763dbb1b2 completion: fix PS1 display during a merge on detached HEAD 16 years ago
Junio C Hamano 7a26e65392 Revert "git-add--interactive: remove hunk coalescing" 16 years ago