Andrew's git
/
gitweb.git
/ search
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Add a demonstration/test of customized merge.
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
2007-02-21
Fix botched "leak fix"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-21
t4119: add test for traditional patch and different...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-21
Merge branch 'fk/autoconf'
diff
|
tree
2007-02-21
Merge branch 'js/name-rev-fix'
diff
|
tree
2007-02-21
prefixcmp(): fix-up leftover strncmp().
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-21
prefixcmp(): fix-up mechanical conversion.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-21
Mechanical conversion to use prefixcmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-21
Add prefixcmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-21
Merge branch 'maint'
diff
|
tree
2007-02-20
Link 1.5.0.1 documentation from the main page.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-20
git-apply: require -p<n> when working in a subdirectory.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-20
git-apply: do not lose cwd when run from a subdirectory.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-20
Merge branch 'js/diff-color-check'
diff
|
tree
2007-02-20
Merge branch 'jc/fetch-notags'
diff
|
tree
2007-02-20
Merge branch 'maint'
diff
|
tree
2007-02-19
Merge branch 'ap/cvsserver'
diff
|
tree
2007-02-19
Merge branch 'maint'
diff
|
tree
2007-02-19
GIT 1.5.0.1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-18
Teach 'git apply' to look at $HOME/.gitconfig even...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-18
Update draft release notes for 1.5.1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-18
Merge branch 'maint'
diff
|
tree
2007-02-18
Update draft release notes for 1.5.0.1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-18
Merge git://git.kernel.org/pub/scm/gitk/gitk into maint
diff
|
tree
2007-02-17
Teach core.autocrlf to 'git apply'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-17
Teach 'git apply' to look at $GIT_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-17
Do not take mode bits from index after type change.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-16
Merge branch 'maint'
diff
|
tree
2007-02-16
git-merge: minor fix for no_trivial_merge_strategies.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-16
Merge branch 'maint'
diff
|
tree
2007-02-16
pretend-sha1: grave bugfix.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-15
remotes.not-origin.tagopt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-14
Merge branch 'maint'
diff
|
tree
2007-02-14
GIT-VERSION-FILE: check ./version first.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-14
t0020: add test for auto-crlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-14
[PATCH] gitk: Use show-ref instead of ls-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-14
[PATCH] Make gitk work reasonably well on Cygwin.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-14
Make sure packedgitwindowsize is multiple of (pagesize...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-14
Add RelNotes 1.5.0.1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree
2007-02-14
Still updating 1.5.0 release notes.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
diff
|
tree