Andrew's git
/
gitweb.git
/ search
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-03-11
Merge branch 'jc/fsck'
diff
|
tree
2007-03-11
Merge branch 'pb/commit-i'
diff
|
tree
2007-03-11
Merge branch 'js/revert-cherry'
diff
|
tree
2007-03-11
Merge branch 'sp/make'
diff
|
tree
2007-03-11
Merge branch 'maint'
diff
|
tree
2007-03-11
Merge branch 'maint' of git://linux-nfs.org/~bfields...
diff
|
tree
2007-03-08
Merge branch 'js/config-rename'
diff
|
tree
2007-03-08
Merge branch 'master' of git://repo.or.cz/git/fastimport
diff
|
tree
2007-03-07
Merge branch 'maint'
diff
|
tree
2007-03-06
revision --boundary: fix uncounted case.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-06
revision --boundary: fix stupid typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-06
git-bundle: make verify a bit more chatty.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-06
revision traversal: SHOWN means shown
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-06
git-bundle: various fixups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-06
revision traversal: retire BOUNDARY_SHOW
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-06
revision walker: Fix --boundary when limited
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-06
Merge branch 'maint'
diff
|
tree
2007-03-06
Merge branch 'master' of git://repo.or.cz/git-gui into...
diff
|
tree
2007-03-06
git-bundle: fix pack generation.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-06
Merge branch 'maint'
diff
|
tree
2007-03-06
git-commit: cd to top before showing the final stat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-06
Merge branch 'master-for-junio' of git://repo.or.cz...
diff
|
tree
2007-03-06
Merge branch 'maint-for-junio' of git://repo.or.cz...
diff
|
tree
2007-03-05
fsck: exit with non-zero status upon errors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-05
unpack_sha1_file(): detect corrupt loose object files.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-05
fsck: fix broken loose object check.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-05
Post 1.5.0.3 cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-05
format-patch --attach: not folding some long headers.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-05
Merge branch 'js/fetch-progress' (early part)
diff
|
tree
2007-03-05
Merge branch 'js/symlink'
diff
|
tree
2007-03-05
Merge branch 'maint'
diff
|
tree
2007-03-05
GIT 1.5.0.3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-04
.gitignore: add git-fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-04
diff-ni: fix the diff with standard input
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-04
diff-ni: allow running from a subdirectory.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-04
Merge branch 'js/diff-ni' (early part)
diff
|
tree
2007-03-04
Merge branch 'maint'
diff
|
tree
2007-03-03
git-merge: fail correctly when we cannot fast forward.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-03
Merge branch 'maint'
diff
|
tree
2007-03-02
Merge branch 'js/commit-format'
diff
|
tree
2007-03-02
Merge branch 'maint'
diff
|
tree
2007-03-01
builtin-fetch--tool: fix reflog notes.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-03-01
git-fetch: retire update-local-ref which is not used...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-28
Add recent changes to draft 1.5.1 release notes.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-28
Merge branch 'js/commit-by-name'
diff
|
tree
2007-02-28
Merge branch 'js/bundle'
diff
|
tree
2007-02-28
Merge branch 'maint'
diff
|
tree
2007-02-28
Start preparing Release Notes for 1.5.0.3
diff
|
tree
2007-02-28
Documentation: git-remote add [-t <branch>] [-m <branch...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-28
index_fd(): convert blob only if it is a regular file.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-28
index_fd(): pass optional path parameter as hint for...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-28
index_fd(): use enum object_type instead of type name...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-28
Merge branch 'np/types'
diff
|
tree
2007-02-28
builtin-fetch--tool: make sure not to overstep ls-remote...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-28
Merge branch 'mc/sendmail'
diff
|
tree
2007-02-28
Merge branch 'js/diff-ni' (early part)
diff
|
tree
2007-02-28
Merge branch 'maint'
diff
|
tree
2007-02-28
fetch--tool: fix uninitialized buffer when reading...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-27
Make 'cvs ci' lockless in git-cvsserver by using git...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-27
builtin-fetch--tool: adjust to updated sha1_object_info().
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-27
Merge branch 'np/types' into jc/fetch
diff
|
tree
2007-02-27
Merge branch 'maint'
diff
|
tree
2007-02-27
git-apply: do not fix whitespaces on context lines.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-26
Merge branch 'master' into js/diff-ni
diff
|
tree
2007-02-26
Documentation: link in 1.5.0.2 material to the top...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-26
Merge branch 'maint'
diff
|
tree
2007-02-26
GIT 1.5.0.2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-26
Documentation: describe "-f/-t/-m" options to "git...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-26
diff --cc: fix display of symlink conflicts during...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-26
Merge branch 'maint'
diff
|
tree
2007-02-26
Merge branch 'jc/merge-symlink' into maint
diff
|
tree
2007-02-26
merge-recursive: fix longstanding bug in merging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-26
merge-index: fix longstanding bug in merging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-25
diff --cached: give more sensible error message when...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-25
Merge branch 'maint'
diff
|
tree
2007-02-25
Add Release Notes to prepare for 1.5.0.2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-25
rerere: do not deal with symlinks.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-25
rerere: do not skip two conflicted paths next to each...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-25
Merge git://repo.or.cz/git-gui into maint
diff
|
tree
2007-02-25
Don't modify CREDITS-FILE if it hasn't changed.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-24
git-fetch--tool takes flags before the subcommand.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-24
Evil Merge branch 'jc/status' (early part) into js...
diff
|
tree
2007-02-24
Merge branch 'js/apply'
diff
|
tree
2007-02-24
Merge branch 'js/no-limit-boundary'
diff
|
tree
2007-02-24
Merge branch 'js/etc-config'
diff
|
tree
2007-02-24
Merge branch 'maint'
diff
|
tree
2007-02-24
diff-patch: Avoid emitting double-slashes in textual...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-24
bundle: reword missing prerequisite error message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-24
Reword git-am 3-way fallback failure message.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-23
.mailmap maintenance after pulling from git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-23
Merge branches 'lt/crlf' and 'jc/apply-config'
diff
|
tree
2007-02-23
Merge branch 'maint'
diff
|
tree
2007-02-22
run_diff_{files,index}(): update calling convention.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-22
update-index: do not die too early in a read-only repository.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-22
git-status: do not be totally useless in a read-only...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-22
t4119: test autocomputing -p<n> for traditional diff...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-22
git-apply: guess correct -p<n> value for non-git patches.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-21
git-apply: notice "diff --git" patch again
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-21
Merge branch 'maint'
diff
|
tree
2007-02-21
Merge branch 'master' of git://repo.or.cz/git-gui into...
diff
|
tree