repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge: a bit more readable user guidance.
2006-04-04
J
u
n
io
C
Haman
o
GIT
1
.
3
.
0-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-04
Junio C Hama
n
o
Merge
in
x
diff
clea
n
u
p
pieces
commit
|
commitdiff
|
tree
2006-04-04
Junio
C
Haman
o
Merge branch 'pb/regex
'
into n
e
xt
commit
|
commitdiff
|
tree
2006-04-04
Junio
C
Hama
n
o
Merge branch 'pe/
c
leanup'
commit
|
commitdiff
|
tree
2006-04-04
Junio C Haman
o
Merge branch 'lt
/
fix-s
o
l
-
pac
k
'
commit
|
commitdiff
|
tree
2006-04-04
Junio C Hamano
Merge
b
ranch 'pe/clean
u
p' into n
e
xt
commit
|
commitdiff
|
tree
2006-04-04
Junio C Hamano
Merge ear
l
y par
t
of
'
j
c/combine' b
r
anch
commit
|
commitdiff
|
tree
2006-04-04
Junio C H
a
mano
Merge branch 'lt/f
i
x-s
o
l-pack' into next
commit
|
commitdiff
|
tree
2006-04-04
Jun
i
o C H
a
mano
s
a
fe_fg
e
ts() -
e
ven
more
a
nal fge
t
s()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-03
Junio C Hamano
Me
r
ge
br
a
n
c
h '
j
c
/
clone' int
o
next
commit
|
commitdiff
|
tree
2006-04-03
Junio C Hamano
git-clone
:
f
i
x ha
n
dling of u
p
s
teram w
h
ose HEAD does
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-02
Junio
C Ha
m
a
no
Merge
b
r
anch 'lt/fix
-
sol-pa
c
k
'
into next
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-02
Junio C Hama
n
o
revision: --
m
ax-age alone does not
n
eed limit_list
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-02
Junio C Hamano
r
e
vision: simpli
f
y
a
r
g
ument par
s
in
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-02
Junio C Hamano
revision: --topo-order and --unpacked
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-01
Jun
i
o C Hamano
Makefile: many programs n
o
w depend on xdiff
/
l
ib
.
a having
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-31
Junio C Hamano
rev-list --bou
n
dary
:
fix re-injecting
bounda
r
y
commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-31
J
u
nio C Hamano
Merge gi
t
://git
.
k
ernel
.
org/pub
/
scm
/
gitk/gi
t
k
commit
|
commitdiff
|
tree
2006-03-30
Jun
i
o
C
Hamano
tree/diff header
c
lea
n
up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-30
Ju
n
i
o C Hamano
a
s
sume unchanged gi
t
:
d
i
ff
-
inde
x
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-30
Junio C Ha
m
ano
r
e
visio
n
.
c "
.
.
B"
syntax: c
o
nstness
f
ix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-30
J
unio C Hamano
revision
arguments:
.
.
B m
e
a
n
s
HEA
D
.
.
B, just like A
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-29
Junio C Ha
m
ano
rev-list --boundary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-29
Junio C Ham
a
no
rev-list: mem
o
ry usage reducti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-28
Junio C Hamano
rev-list --no-merg
e
s: argument parsing fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-28
Junio C Hamano
GIT 1
.
3
.
0 r
c
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-28
Junio C Hamano
Merge bran
c
h
ak/svn
commit
|
commitdiff
|
tree
2006-03-27
Junio C Hamano
Merge
branc
h
'lt/
d
iffgen' i
n
to next
commit
|
commitdiff
|
tree
2006-03-27
Junio C Hamano
M
erge branch 'maste
r
' into
n
e
xt
commit
|
commitdiff
|
tree
2006-03-27
Junio C Hamano
a
d
d clean
and
i
gnore rul
e
s
for xdiff/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-26
Junio C Hamano
Merge br
a
nch
'
jc/thin' into next
commit
|
commitdiff
|
tree
2006-03-26
Junio
C
H
amano
git-push: make
-
-thin pack tr
a
nsfer t
h
e default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-26
Junio C Hamano
Merge branches 'jc/clone'
a
nd 'jc/name'
commit
|
commitdiff
|
tree
2006-03-26
Junio
C Hamano
Merg
e
b
ranch 'jc
/
me
r
ge'
commit
|
commitdiff
|
tree
2006-03-26
J
unio C Hamano
M
e
rge br
a
nch 'lt/diffge
n
'
into next
commit
|
commitdiff
|
tree
2006-03-26
Junio C Haman
o
Merge git://g
i
t
.
k
e
rnel
.
org/pub/scm
/
gitk/gi
t
k
commit
|
commitdiff
|
tree
2006-03-26
Junio C
H
ama
n
o
t
r
u
e built-in diff:
run
everything
i
n-core
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-26
Ju
n
i
o
C Hamano
Merge
branch 'ew/email' i
n
to next
commit
|
commitdiff
|
tree
2006-03-26
Junio C H
a
ma
n
o
Merge
branch 'l
t
/dif
f
g
en' into next
commit
|
commitdiff
|
tree
2006-03-26
Junio C
Hamano
M
e
r
g
e
branc
h
'rs
/
ta
r
-tree' i
n
to
n
e
xt
commit
|
commitdiff
|
tree
2006-03-26
Junio
C Hamano
built-in diff: minimum t
w
e
aks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-25
J
u
nio C Hamano
commit-tree
:
check re
t
ur
n
value from write_sha1_file()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-24
J
un
i
o C Ham
a
no
Merge branch
'
jc/name' i
n
to next
commit
|
commitdiff
|
tree
2006-03-24
Junio
C
H
a
mano
M
er
g
e
b
r
anch
'
jc/cvsimp
o
rt'
commit
|
commitdiff
|
tree
2006-03-24
Junio C Hamano
M
e
rge
b
r
anch 'jc
/
pull'
commit
|
commitdiff
|
tree
2006-03-24
Jun
i
o C Haman
o
Merge branch 'jc/
f
etch'
commit
|
commitdiff
|
tree
2006-03-24
J
unio C Ha
m
ano
send-email: Identify a
u
t
h
or at t
h
e top
when sending
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-24
Juni
o
C Haman
o
s
ha1_name
:
make
c
ore
.
wa
r
nambiguou
s
r
ef
s
the
default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-24
Junio C Hamano
sha
1
_name: warning
ambiguo
u
s refs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-22
Junio C Haman
o
M
erge branch
'
jc/pull' int
o
next
commit
|
commitdiff
|
tree
2006-03-22
Jun
i
o C Hamano
git-
p
u
ll:
reword "imp
o
ssi
b
le
t
o f
a
st-forward
"
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-22
Junio C Hamano
git-
p
u
ll: further
s
afe
t
y
w
hil
e
on
trac
k
ing branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-22
Junio C Hamano
Merge
b
ranch
'
jc/revlist'
i
n
to n
e
xt
commit
|
commitdiff
|
tree
2006-03-22
Junio C Ha
m
a
n
o
Merge branch 'jc/clo
n
e
'
into
next
commit
|
commitdiff
|
tree
2006-03-22
Junio C Hamano
git-
c
lone:
t
ypofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-22
J
u
n
io C Ha
m
ano
rev-list --timestam
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-22
Junio C Ham
a
no
g
i
t-a
p
p
ly: do not
b
arf when updating an originally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-21
Junio C Ham
a
no
http-push
.
c: squelch C90 warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-21
Juni
o
C
Hamano
M
e
r
g
e branch
'
jc/clon
e
'
i
n
t
o next
commit
|
commitdiff
|
tree
2006-03-21
Ju
n
io C Hamano
M
erge branch 'jc/name' i
n
to ne
x
t
commit
|
commitdiff
|
tree
2006-03-21
Junio C Hamano
cl
o
ne: record
the
r
e
m
ote prima
r
y branch with re
m
otes
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-21
J
u
nio C Ha
m
ano
get
_
sh
a
1_bas
i
c(): try re
f
s/
.
.
.
and fi
n
al
l
y refs
/
remotes
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-21
J
unio C Hamano
Mer
g
e branch 'jc/name' in
t
o next
commit
|
commitdiff
|
tree
2006-03-21
Junio C Hamano
Merge branc
h
'jc/clone' i
n
to ne
x
t
commit
|
commitdiff
|
tree
2006-03-21
Junio C Hamano
revamp git-clon
e
(take #2
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-21
J
unio C Ham
a
no
core
.
w
arnambiguo
u
s
r
efs: warns when "n
a
me"
is used and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-20
J
unio C Hamano
http-f
e
tch:
nice
r
warning for a serve
r
w
ith unreliable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-20
J
u
nio C Ham
a
n
o
Merge branch 'jc/merge'
i
nto next
commit
|
commitdiff
|
tree
2006-03-20
Junio
C
Ham
a
no
Merge
b
ranch
'j
c
/clone' i
n
to next
commit
|
commitdiff
|
tree
2006-03-20
J
un
i
o C Hamano
git-merge
knows some
s
trateg
i
es
w
an
t
to
s
k
ip trivial
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-20
Ju
n
io C Ham
a
no
rev
a
mp git-clone
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-20
Junio C
Hamano
generat
e
-cmdlist
:
style cleanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-19
Junio C
Hamano
unpack_delta_entry(): redu
c
e memory
f
ootprint
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-18
Junio C Hamano
Me
r
ge branch 'mast
e
r'
i
n
t
o next
commit
|
commitdiff
|
tree
2006-03-18
Junio C Hamano
Merg
e
branch 'master' into next
commit
|
commitdiff
|
tree
2006-03-18
Junio C Hamano
git-pu
l
l: run repo-config with das
h
form
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-18
Junio C Ha
m
ano
Merge
b
ranch 'jc/c
v
simp
o
rt' int
o
next
commit
|
commitdiff
|
tree
2006-03-18
Ju
n
io C Haman
o
cvsimpor
t
: fix re
a
d
i
ng
from rev-parse
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-18
Junio C Hamano
Mer
g
e
branch 'jc/empty'
commit
|
commitdiff
|
tree
2006-03-18
J
unio
C Hamano
M
e
r
ge b
r
anch
'
m
aster' into next
commit
|
commitdiff
|
tree
2006-03-17
Junio C
Hamano
M
erge branch '
j
c/cvsimport'
in
t
o nex
t
commit
|
commitdiff
|
tree
2006-03-17
J
u
nio C Hamano
Merg
e
branch 'j
c
/fetc
h
' into
n
e
x
t
commit
|
commitdiff
|
tree
2006-03-17
Junio C Hamano
Merge
b
ranch 'ew/
a
bbrev' into next
commit
|
commitdiff
|
tree
2006-03-17
Junio
C
Hamano
fetch: exit non-zero
w
hen f
a
st-forwar
d
chec
k
fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-17
Junio C Hamano
cvsimport: hono
r
-i and non
-
i
upon su
b
seque
n
t im
p
orts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-16
Junio C
H
am
a
no
Merge bra
n
ch 'master' int
o
next
commit
|
commitdiff
|
tree
2006-03-15
Junio
C
Ham
a
no
Merge branch 'lt/diff' into nex
t
commit
|
commitdiff
|
tree
2006-03-15
Jun
i
o
C
Hama
n
o
Merge branch
'
master' into
n
ext
commit
|
commitdiff
|
tree
2006-03-15
Ju
n
io C Hamano
Me
r
g
e
branch 'lt/diff' into next
commit
|
commitdiff
|
tree
2006-03-13
Junio C Hamano
M
erg
e
branch 'jc/p
a
ck'
commit
|
commitdiff
|
tree
2006-03-13
J
u
n
i
o C Hamano
Merge branch '
j
c/fsck
'
commit
|
commitdiff
|
tree
2006-03-13
Jun
i
o C Ham
a
no
Merge branc
h
'nh
/
h
t
t
p
'
commit
|
commitdiff
|
tree
2006-03-13
Junio C H
a
mano
Merge branch 'fk/blame'
commit
|
commitdiff
|
tree
2006-03-13
Junio C Hamano
Merge
branch 'jc/diff' int
o
n
e
xt
commit
|
commitdiff
|
tree
2006-03-13
Junio C Hamano
Merge branch 'jc/diff' into nex
t
commit
|
commitdiff
|
tree
2006-03-13
Junio
C
Ham
a
n
o
di
f
f
c
o
re-delt
a
: tweak has
h
base value
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-13
J
u
ni
o
C
Hamano
Mer
g
e
branch 'jc
/
diff' into next
commit
|
commitdiff
|
tree
2006-03-13
J
unio C Hamano
Me
r
ge bra
n
ch 'jc/empty' into next
commit
|
commitdiff
|
tree
2006-03-13
Junio C Hamano
diffcore-delta:
m
ake the hash a bit de
n
ser
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-03-13
Junio C H
a
mano
revision traversal: -
-
remove-empty fix
(
t
a
ke #2)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next