repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sb/merge-friendly'
2006-12-24
Junio
C H
a
m
ano
Merge branch 'sb/m
e
rge-frie
n
dly'
commit
|
commitdiff
|
tree
2006-12-24
Junio C H
a
mano
M
e
rge br
a
nch
'
js
/
r
e
re
r
e'
commit
|
commitdiff
|
tree
2006-12-23
Jun
i
o C H
a
m
ano
g
i
t-t
a
g:
l
o
s
e exit a
f
t
er die
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Junio C Hamano
Rea
l
ly
f
ix head
e
r
s f
o
r __Fr
e
eBSD_
_
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C Hamano
Do not sup
p
o
r
t "partial
U
RL shorthand" anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C Hama
n
o
d
e
f
a
u
lt pull: fo
r
get a
b
o
u
t "ne
w
bie
p
rot
e
c
tion" for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
merg
e
a
n
d reset: a
d
jus
t
f
o
r "reset
--hard"
m
e
s
s
ages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
commit-
t
ree: do not overflow
M
AX
P
ARENT
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Juni
o
C Hama
n
o
_
XOPE
N
_SOURCE problem also e
x
ists on
F
reeB
S
D
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C
H
a
mano
parse-
r
emot
e
: mark
all refs not
for mer
g
e
only
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
unio C
Hamano
Me
r
ge bran
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2006-12-22
J
unio C Hamano
Re
v
ert "gi
t
-
p
u
l
l
:
r
efuse default merge without branch
.
.
.
commit
|
commitdiff
|
tree
2006-12-21
Jun
i
o C
H
am
a
no
Merge branch 'ew/svn-
p
m
'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ham
a
no
diff
documen
t
ation: mo
s
tly
t
al
k
about <commit>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merge
b
ranch
'jc/lef
t
right'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merge bra
n
c
h
'
jc/blame
'
commit
|
commitdiff
|
tree
2006-12-20
J
u
n
io C Hama
n
o
M
e
rge branch 'j
c
/br
a
n
c
h-remove-rem
o
te'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ham
a
no
M
e
rge br
a
nc
h
'jc/clon
e
'
commit
|
commitdiff
|
tree
2006-12-20
Junio C H
a
mano
compat/inet
_
ntop:
do not use u_i
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C H
a
mano
spu
r
ious
.
sp in manpages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
g
i
t-add: error ou
t
when given
n
o arguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
J
unio
C Hamano
Mer
g
e br
a
nc
h
'main
t
'
commit
|
commitdiff
|
tree
2006-12-20
Juni
o
C
Hamano
G
IT
1
.
4
.
4
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
J
u
ni
o
C
Haman
o
simpl
i
fy in
c
l
u
sion
o
f sy
s
tem he
a
d
e
r f
i
les
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C H
a
mano
config_ren
a
me
_
section:
f
ix
F
ILE* leak
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C H
a
m
a
no
fix populate-filesp
e
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C
Ham
a
n
o
Revert "Ma
k
e left
-
ri
g
h
t
automatic
.
"
commit
|
commitdiff
|
tree
2006-12-19
J
unio C
H
amano
U
s
e preproc
e
ssor c
o
nstants f
o
r
e
nvironment variab
l
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
unio C H
a
m
ano
Do not create $
G
I
T
_DIR/remot
e
s
/
dire
c
to
r
y
anym
o
re
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
u
ni
o
C
H
a
mano
Merge
branch 'jc/test-clone' into jc
/
clone
commit
|
commitdiff
|
tree
2006-12-19
J
u
n
i
o
C Hamano
Revert
"fix
t
estsui
t
e: ma
k
e
sure
t
hey use templates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C Ha
m
ano
blame:
-b (blame
.
blankboundary)
and
-
-root (
b
lame
.
show
r
oot)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
u
n
i
o
C
Hamano
Teach git-br
a
nch to
delete track
i
ng
b
ranches wit
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
fix testsuite: make sure
t
hey us
e
templates fr
e
shly
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Ju
n
io C Hamano
rerer
e
: fix breakag
e
of resolving
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
ra
c
y-git: docum
e
nt
a
tion updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ham
a
no
show-ref: fix
-
-exclude-existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Haman
o
parse-re
m
ot
e
::exp
a
nd_refs_wildc
a
rd(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Hamano
s
h
o
w-re
f
: fix --v
e
rify --hash=le
n
g
th
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C H
a
mano
s
h
ow-ref:
f
i
x --quiet --verify
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
M
e
r
ge branch '
j
c/blam
e
-b
o
un
d
ary'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ham
a
no
Merge
b
ranch 'jc/reflog'
(ea
r
ly
part)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Me
r
g
e
b
r
anch 'js/branch-conf
i
g'
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Hamano
Merge branch 'j
n
/w
e
b' (early part)
commit
|
commitdiff
|
tree
2006-12-18
Junio C
Hamano
avoid accessing
_all_
loose
refs in
g
it-
s
how-
r
ef -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
git-fetch
:
A
void reading pack
e
d
refs over and o
v
er
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Hamano
Teach
s
h
ow-
b
ranc
h
how t
o
sho
w
ref-log dat
a
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Make left-right automatic
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
aman
o
Teach all of log
f
ami
l
y --left-
r
ight
o
utput
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ha
m
ano
rev-list --
l
eft-right
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
mar
k
up fix in
sv
n
import
d
ocumentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
J
u
nio C Hamano
Fix m
i
s-mark-up in gi
t
-merge-file
.
txt docu
m
ent
a
tio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fix c
h
ec
k
_
fil
e
_directory
_
confli
c
t()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
git-add:
r
emove c
o
nfl
i
cting entry when
add
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
J
u
n
io C
H
am
a
no
upda
t
e
-
index: make
D
/
F
conflict error a bit more verbose
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
J
u
n
i
o C Hamano
git-
c
lo
n
e:
los
e
the traditional 'no-separate-
r
e
m
ote
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
g
i
t-clone: los
e
the
artif
i
cial "
f
irst" fetch re
f
spec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C Hamano
git
-
pu
l
l: r
e
fuse d
e
faul
t
mer
g
e without br
a
n
ch
.
*
.
merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jun
i
o C Hamano
g
i
t-cl
o
ne: us
e
wi
l
dcard sp
e
ci
f
ication
for
tracking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Juni
o
C Ha
m
ano
merge:
give a
b
it p
r
ettier merge
m
ess
a
ge to "merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
H
a
m
ano
Merg
e
branch 'js/show'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git-reset [--mixed] <
t
ree> [--] <pat
h
s
>
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Haman
o
git-reset: make
it work from with
i
n
a su
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C Ham
a
no
git-f
e
tch: make it
w
or
k
from within a subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C Ham
a
no
Merge bra
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Upda
t
e
git-dif
f
documentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
J
uni
o
C Ha
m
ano
Merge branch 'jc/di
f
f--c
a
ched'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
m
a
no
gi
t
-
svn: all
o
w both
d
i
f
f
.
colo
r
a
n
d
color
.
d
i
ff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
config
d
ocumentat
i
on: group color items togeth
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-
b
lame
:
show lines attributed to boundary commits
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
Merg
e
b
r
a
nch 'jc/read
-
t
r
ee-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
an
o
M
erge branch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
Merge branch 'np/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Mer
g
e b
r
an
c
h 'lh/
b
r
anch-rename'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merg
e
branch '
j
c/commit-careful'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge b
r
anch 'ap/clone-origin
'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
Merge branch 'j
c
/numstat
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
e
r
ge branc
h
'rr
/
cvsexportco
m
mit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'ap/branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
bran
c
h --colo
r
:
c
hange
d
e
fault c
o
l
o
r
selection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Haman
o
Merg
e
br
a
nch 'js/
m
erge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Ha
m
a
n
o
send-pack: tighten
c
h
e
cks for
r
emote names
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-pus
h
: accept tag <tag
>
a
s advertised
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
spu
r
ious
.
sp in manpages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
git merge: rewo
r
d failure me
s
sage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
R
e
vert "g
i
t-
d
iff: Intro
d
uce
--i
n
dex and
d
eprec
a
te
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Haman
o
M
e
rge
b
ranch
'
m
a
int'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io
C Hamano
git-push:
document
r
e
moval
o
f remote ref wi
t
h :<
d
s
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
Merg
e
b
ra
n
c
h 'm
a
ster' into
js/merge
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
ama
n
o
Me
r
ge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
ama
n
o
a
d
d tes
t
case
f
or rec
u
rsive merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
d
iff --numstat: show binary with '-' to match "ap
p
ly
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
J
u
nio C H
a
man
o
shortlog: fi
x
s
egfault on empty authorna
m
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
shortl
o
g: remove "[PATCH]"
p
refix fr
o
m shor
t
log output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
io C Haman
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2006-12-10
Junio C Hama
n
o
git-commit: all
o
w --only to
l
o
se wh
a
t was staged earlier
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Haman
o
Docum
e
ntat
i
on/git-commit: rewr
i
te to make
i
t
more end
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Jun
i
o
C
H
a
ma
n
o
git-rer
e
re: add 'g
c
' command
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
J
u
nio C Hamano
Fix p
e
rl
/
build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
Ju
n
io C Ha
m
ano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
next