repo.or.cz
/
git
/
mergetool.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/web'
2006-08-13
Junio C Ham
a
no
Merge br
a
n
c
h 'jn/web'
commit
|
commitdiff
|
tree
2006-08-13
Junio
C
Hamano
M
e
rge
b
ranch 'lt
/
web'
commit
|
commitdiff
|
tree
2006-08-13
J
unio C Hamano
Merge br
a
nch 'jn/conf'
commit
|
commitdiff
|
tree
2006-08-13
J
u
n
i
o
C Hamano
Mer
g
e bra
n
ch
'
jc/grep'
commit
|
commitdiff
|
tree
2006-08-13
Juni
o
C
H
a
mano
Merge
b
ranc
h
'mk/rename'
commit
|
commitdiff
|
tree
2006-08-13
Junio
C
H
a
m
ano
M
e
rge branch 'ml/pager'
commit
|
commitdiff
|
tree
2006-08-13
Junio C Hamano
G
I
T 1
.
4
.
2
commit
|
commitdiff
|
tree
2006-08-13
J
unio C
Hamano
Merge git://git
.
kern
e
l
.
org/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2006-08-13
Junio C
H
a
mano
t/t4
0
13:
fix futzing with the version str
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-13
Junio
C
Hamano
Better error messa
g
e when
we a
r
e un
a
ble to lock the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-13
Junio C Hamano
git-am: give better diagnostics
when
the pa
t
ch does
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-12
Junio C Hamano
M
er
g
e branch 'r
j
/
h
eader
'
commit
|
commitdiff
|
tree
2006-08-12
Junio C Hamano
git-g
r
ep:
show pa
t
h
n
ames rela
t
ive to the c
u
rrent d
i
rectory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-12
Jun
i
o C
H
amano
g
i
t-sh-setup: do not use repo-config to tes
t
the git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-11
Junio C
Hamano
Merge branch 'r
n
/push-dav'
commit
|
commitdiff
|
tree
2006-08-10
Junio
C Hamano
Me
r
ge branch
'
master' into mk/rename
commit
|
commitdiff
|
tree
2006-08-10
Junio C Hamano
built
i
n-app
l
y:
r
emove unused
i
ncr
e
ment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-10
Junio C Hama
n
o
Fix gi
t
-diff A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-10
J
u
n
io C Hamano
combine-diff: use color
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-10
J
u
nio C Hama
n
o
git-apply:
applying a patch
t
o
mak
e
a symlink
shorter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-09
Ju
n
io C Hamano
a
llow diff
.
renamelimit
to be set regardless of -M/-C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-09
Ju
n
io C Hamano
ma
k
e -
-
f
i
nd-copies-har
d
er imply -C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-09
J
u
nio
C H
a
man
o
find_un
i
que_
a
bbrev() with
l
en
=
0 should n
o
t abbrev
i
ate
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-09
J
u
n
io
C
Hamano
check return value from diff_setup_d
o
ne()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-09
Junio C Hamano
F
i
x tutor
i
a
l
-
2
.
html
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-09
Jun
i
o
C Hamano
D
o
cumen
t
atio
n
: git
-
status tak
e
s
the
s
ame opti
o
n
s
as
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-09
Junio C Hama
n
o
autoc
o
nf: clea
n
tem
p
orary
file
m
ak
.
append
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-08
J
u
nio C Haman
o
Merge branch 'mast
e
r' i
n
to
m
k
/
r
e
name
commit
|
commitdiff
|
tree
2006-08-08
Ju
n
io C
Hamano
G
I
T-
V
ERSION-GEN: a
d
j
ust for an
c
ient git
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-08
Junio C H
a
mano
b
u
i
ltin-mv: fi
x
use of uni
n
itialized
memory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-08
Junio C Hama
n
o
deb
u
ggin
g
: XMAL
L
OC_PO
I
SON
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-06
Junio C Ham
a
no
Fix "grep
-
w"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-05
J
unio C Hamano
Ma
k
efile:
C
ygwin does not seem to need
N
O_STRLCPY
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-04
Juni
o
C Hamano
a
u
toco
n
f: NO_IPV6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-04
Junio C Ham
a
n
o
au
t
oconf: fi
x
NEEDS_SSL_
W
ITH
_
CRYPTO
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-04
J
u
nio C Ha
m
ano
Mer
g
e branch 'jc/c
9
9'
commit
|
commitdiff
|
tree
2006-08-04
J
unio
C
Ham
a
no
git
.
c: Rename N
E
EDS_PRE
F
I
X t
o
RUN_SETUP
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-04
Junio C Hama
n
o
bu
i
l
ti
n
s:
Makefile clean-u
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-04
Ju
n
io
C
Hama
n
o
Mak
e
g
i
t
-
chec
k
o
ut-ind
e
x a builtin
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-04
Junio C H
a
mano
Furt
h
e
r
clean-up: usa
g
e() vs die()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-03
J
u
n
io
C
Hamano
GI
T
1
.
4
.
2-
r
c3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-03
Ju
n
io
C
H
amano
Documentatio
n
/git
.
txt: link git-svn and git-instaweb
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-03
Junio C Hamano
Mer
g
e
b
ranch 'jc/sid
e
band'
commit
|
commitdiff
|
tree
2006-08-03
Junio C Hamano
sideband:
d
o
n
ot
u
se color, jus
t
s
a
y
"r
e
mote:"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-03
Junio C Ha
m
a
n
o
Sho
w
bot
h
b
l
ob names from "
g
it diff blob1
b
lob2"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-03
Junio C Ha
m
ano
diff
.
c:
d
o not use pathname
compar
i
son
t
o tell renames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-03
Junio C Hamano
Add a couple of su
b
direc
t
ory tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-03
Junio C Ham
a
no
r
ead-tree: shadowed
v
ariable fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-03
Junio C Ha
m
ano
Fi
x
"git d
i
ff blob
1
blo
b
2" showing the diff in reverse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-03
Junio C
H
a
mano
Cy
g
win n
e
eds NO_C99_FOR
M
AT???
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-02
Junio C Hamano
gitweb:
d
o not
u
se @@FO
O
@@ fo
r
r
ep
l
aced token
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-01
J
u
nio C Hamano
Ma
k
efile:
g
i
tweb/
g
itweb
.
cgi is
n
o
w generated
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-01
J
u
nio C Ha
m
ano
gitweb/RE
A
DME
:
do not bu
g
Kay w
i
th g
i
tweb quest
i
o
ns
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-01
Junio C Hamano
fetch/clone: mark messages from re
m
o
te
side stand out
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-01
J
un
i
o
C Hamano
Merge branch
'rs/rebase'
commit
|
commitdiff
|
tree
2006-08-01
Junio C Hamano
Me
r
ge branch
'ml/pager'
commit
|
commitdiff
|
tree
2006-08-01
Junio C Hamano
M
e
r
ge
branc
h
'
jc/c
h
e
ckout'
commit
|
commitdiff
|
tree
2006-08-01
Junio
C
H
am
a
no
gitweb: avoid undefined value warning in
p
rint_p
a
ge_
p
ath
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-01
Junio C H
a
m
ano
gitweb:
w
hen
showi
n
g history of a tree, show t
r
e
e
l
ink
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-01
Ju
n
io C Ham
a
n
o
gitweb: fix use of uninitialized value
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-01
Junio C Haman
o
gitweb:
a
n obvious cut and paste error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-08-01
J
unio C
H
amano
gitweb:
T
here can be m
o
r
e than
t
wo levels
o
f
subd
i
rectori
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-31
Junio C Ham
a
n
o
Builtins:
control the use of pager fr
o
m
the comm
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-31
Junio
C
Hamano
git
-
checko
u
t
:
allow
"
c
heckou
t
HEAD -- path"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-30
Junio C Hamano
Merge branch 'lt/web'
commit
|
commitdiff
|
tree
2006-07-30
Junio C Hamano
Merg
e
branch '_
_
/setup-n-mv'
commit
|
commitdiff
|
tree
2006-07-30
Junio
C
H
a
m
ano
Merge branch
'js/mv'
commit
|
commitdiff
|
tree
2006-07-30
Juni
o
C Hamano
M
e
rge branch 'jn/make'
commit
|
commitdiff
|
tree
2006-07-29
Junio C Haman
o
Merge
b
ranc
h
'lt/
s
etup' into
_
_/setup-n-mv
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-28
Junio C
Hamano
Merge branch
'pb/multi-fe
t
ch'
commit
|
commitdiff
|
tree
2006-07-28
J
u
nio C Hama
n
o
Merge branch 'lt/web'
commit
|
commitdiff
|
tree
2006-07-28
J
uni
o
C Hamano
Merge
b
ra
n
ch 'js/cvs'
commit
|
commitdiff
|
tree
2006-07-28
Junio C Ham
a
no
Merge bran
c
h
'
j
s
/alias-p'
commit
|
commitdiff
|
tree
2006-07-28
Junio C Hamano
Merge branch 'jc/diff'
commit
|
commitdiff
|
tree
2006-07-28
Jun
i
o C
H
am
a
no
t4103: fix b
i
nary patch applica
t
ion te
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-28
Junio C
H
a
m
ano
git-apply -R: b
i
nary
patches are irre
v
ersible for
now
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-28
Juni
o
C Hamano
log
a
nd di
f
f family:
ho
n
or
c
onfig eve
n
from subdi
r
ectories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-28
Junio C Hamano
git-reset
:
detect u
p
dat
e
-re
f
e
rror and
r
e
p
o
rt it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-28
Junio C Hamano
lost-found: use fsck-obj
e
cts --full
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-26
Ju
n
io C Hamano
M
erge b
r
anch 'pb/confi
g
ure'
commit
|
commitdiff
|
tree
2006-07-26
Junio C Hamano
t
411
2
:
s
implify the t
e
st a
n
d
re
m
ove
u
nneed
e
d working
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-25
Junio C Hamano
Merge branch 'j
c
/clone-bind-f
a
i
l
ure'
commit
|
commitdiff
|
tree
2006-07-25
J
unio
C
H
a
m
ano
Merge branch 'jt/format-patch'
commit
|
commitdiff
|
tree
2006-07-25
Juni
o
C Ham
a
n
o
Merge branc
h
'ew/apply
'
commit
|
commitdiff
|
tree
2006-07-25
Junio C Hama
n
o
Me
r
ge branch 'jc/read
-
tre
e
'
commit
|
commitdiff
|
tree
2006-07-25
Junio C
H
amano
Mer
g
e branch 'l
t
/objformat'
commit
|
commitdiff
|
tree
2006-07-17
J
u
nio C Hamano
unpack-obje
c
t
s
: rem
o
ve stale and conf
u
sing comment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-17
Juni
o
C Ha
m
ano
git-fetch: fix --ke
e
p vs --thin
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-17
Junio
C H
a
mano
git-diff
A
.
.
.
B
t
o
(usua
l
ly) mean "git-diff
`
git-merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-17
J
u
nio C Haman
o
Me
r
ge branch 'sp/reflog'
commit
|
commitdiff
|
tree
2006-07-17
Junio
C H
a
m
a
no
apply: handle type-chang
i
ng patch correctly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-17
Junio
C Hamano
apply: spl
i
t out removal
a
n
d creation into different
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-17
Junio
C
Hamano
apply: check D/F con
f
lic
t
s
more carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-17
Junio C Hamano
c
hec
k
out -f failed to chec
k
out a file if a
n
existi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-16
Junio
C Hamano
s
h
o
w-branch
:
fix
performa
n
ce problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-15
Junio C Hamano
built
i
n-log:
typefix for recent format-p
a
t
c
h changes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-14
Junio C Ham
a
n
o
Documentati
o
n/Makefile: produ
c
t depends on asci
i
doc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-14
Jun
i
o C
H
ama
n
o
M
e
r
ge branch 'l
t
/
un
i
type
'
commit
|
commitdiff
|
tree
2006-07-14
J
u
n
i
o
C Hamano
Merge br
a
nch 'sp/lazy-mkdir'
commit
|
commitdiff
|
tree
2006-07-14
Junio C H
a
mano
b
u
iltin-pr
u
ne
.
c
: forgot
TYPE => OBJ c
h
anges
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next