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 'jc/blame'
2006-12-20
Ju
n
io C Haman
o
Merge bran
c
h
'
j
c
/
b
lame'
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C
H
amano
Merge
b
ranch '
j
c/bran
c
h
-r
e
move-remote'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ha
m
ano
Merge br
a
nch 'jc/
c
lone'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Haman
o
compat/
i
net_ntop: do not use
u_int
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Juni
o
C H
a
mano
git-add: error ou
t
w
h
e
n
g
iven
no argum
e
nt
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C Hamano
GIT 1
.
4
.
4
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C H
a
mano
simp
l
ify inclusion
o
f system hea
d
er files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C Hamano
config_
r
ename_
s
ecti
o
n: fix FILE* leak
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o
C Hamano
f
i
x popu
l
at
e
-filespec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
Hamano
Use prep
r
oc
e
s
s
or co
n
stants f
o
r e
n
vironm
e
nt
v
ariable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
amano
Do
not cre
a
t
e $GIT_DIR/r
e
motes/ dir
e
c
t
ory anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C H
a
mano
Me
r
g
e branc
h
'jc/test-clone' into jc/c
l
one
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Revert
"fix test
s
uite
:
make
s
ure
they use
t
emplates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
bl
a
me: -b (b
l
ame
.
blan
k
boundary)
and
--roo
t
(blame
.
showroo
t
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Teach
git-
b
r
anch to de
l
et
e
tracking branches with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
amano
fix
t
estsuite
:
ma
k
e sure they use
templ
a
tes freshly
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
H
a
mano
re
r
ere: f
i
x breakage o
f
resol
v
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C
Hamano
racy-git: documentatio
n
updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
show-re
f
:
fix --exclu
d
e-ex
i
st
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C H
a
m
a
no
p
a
r
s
e-remo
t
e::e
x
pand_refs_w
i
ldc
a
rd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
mano
show-re
f
:
f
ix --v
e
ri
f
y --h
a
sh=length
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
show-ref: fix --
q
uiet --verify
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge b
r
anch 'jc/b
l
a
m
e-boundary'
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio
C Ham
a
n
o
Mer
g
e
b
ranch 'jc/r
e
flo
g
' (early part)
commit
|
commitdiff
|
tree
2006-12-18
J
unio
C
H
a
m
ano
M
e
r
g
e bran
c
h 'js/br
a
nch-config'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
M
e
rge
b
r
a
nch 'jn/web' (early part)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Haman
o
avoid accessing
_
a
ll_
l
oose refs in git-
s
how-ref -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
git-fetch: Avoi
d
reading packed refs
o
ver and over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C H
a
mano
Teach
s
how-bran
c
h
ho
w
to sho
w
r
ef-log
d
ata
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ha
m
ano
m
a
rkup
fix in svnimport do
c
umentati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hamano
Fix mis-
m
ark-up
i
n
g
it-merge
-
fi
l
e
.
txt
documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C
H
am
a
no
Fix
check_file_directory_confl
i
ct()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Hama
n
o
gi
t
-a
d
d: remove conflicting entry when add
i
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
update-in
d
ex: make D/F
c
onflict error a bi
t
mor
e
verbose
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
H
amano
g
it-clone: lose the traditional 'no-separ
a
t
e-remote
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-clone: lose the art
i
ficial "first"
f
e
t
ch refspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Ha
m
a
n
o
git-pul
l
:
refuse d
e
fault merge wi
t
hout branch
.
*
.
merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jun
i
o
C
Ham
a
no
git-clone: us
e
wild
c
ard speci
f
ication for track
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Ju
n
i
o C Hamano
merge: give a bit
pretti
e
r merge mess
a
ge to "merg
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
J
u
nio
C
Ham
a
no
Merg
e
bran
c
h '
j
s/show'
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
i
o
C
Hamano
git-reset [
-
-mixed] <tree> [--
]
<p
a
ths>
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
H
amano
g
i
t-r
e
set:
m
a
ke it work from with
i
n a s
u
b
dir
e
ct
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio C H
a
mano
git-fe
t
c
h: m
a
ke it w
o
r
k
fr
o
m
within a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
J
u
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-14
J
unio C Hamano
Update git-di
f
f documen
t
a
t
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C Ha
m
ano
Mer
g
e
bran
c
h 'jc/diff--
c
ached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
n
o
git-svn: al
l
ow
b
oth di
f
f
.
color an
d
color
.
d
i
ff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
confi
g
documentation: group color items toge
t
her
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
g
i
t
-
b
l
a
me: show lines attrib
u
ted to
bound
a
ry
c
ommi
t
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
io C Hamano
M
erg
e
bra
n
ch 'jc
/
rea
d
-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'ew/
r
erere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
a
no
Merge branc
h
'np/addc
o
mmit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merg
e
branc
h
'lh/branch-ren
a
me'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
i
o
C Haman
o
Merge branch 'jc/com
m
it-care
f
ul'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'ap/clone-ori
g
i
n
'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
Merg
e
branch
'jc/nums
t
at'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Ha
m
ano
Merge branch 'rr/cv
s
exportcomm
i
t'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
Me
r
ge branch 'ap/branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
branch --color: ch
a
n
g
e default
color select
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Haman
o
Merge br
a
n
ch
'
j
s
/merge'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
send-pack: tighten
c
h
e
cks for
r
emote
n
ames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
git-push: accep
t
ta
g
<
t
ag> as advertised
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
s
p
u
rio
u
s
.
sp in
m
a
n
p
ages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
gi
t
m
e
rge: rewo
r
d
failure message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Revert "git-diff: Introd
u
ce --index and deprecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Merge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
g
i
t-push:
d
ocument removal
of remote
ref
with :<dst
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
Merge bran
c
h
'master' int
o
js/merge
commit
|
commitdiff
|
tree
2006-12-13
J
unio
C Hama
n
o
Mer
g
e bra
n
ch
'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io
C
H
a
m
a
no
add test case for recursive mer
g
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
i
o
C
Hama
n
o
diff --num
s
tat: show b
i
na
r
y with '-' to
m
atch "apply
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
J
u
nio C H
a
mano
shortl
o
g
: fi
x
segfault on
em
p
ty author
n
ame
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Jun
i
o
C Ham
a
no
s
hortlog:
r
emove "[
P
A
T
CH]"
prefix from shortlog
o
utput
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Juni
o
C
H
a
mano
Merge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-10
Junio C Hamano
g
i
t-commi
t
:
allow --only to lose what was
s
ta
g
ed earlier
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Junio C
Hamano
Docu
m
entation
/
git-commit: rewrite to
m
ake
i
t more e
n
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
J
u
nio C Hamano
git-re
r
ere
:
add '
g
c
'
comman
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Junio
C
Hamano
F
i
x per
l
/
build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hamano
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
g
i
t-merg
e
: fix "fix c
o
nfusio
n
betw
e
en tag and
branc
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
J
uni
o
C Hamano
git-merge: sque
l
ch
nee
d
l
e
ss error me
s
sage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C Hamano
Merg
e
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ha
m
an
o
git-reset to
remo
v
e "$GIT_DIR/MERGE_
M
S
G"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Ha
m
ano
r
ead-tree: docume
n
t
--exclude-per-d
i
rectory
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C Ha
m
ano
Loosen "working fil
e
will be lo
s
t" check in Porcelain-ish
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
aman
o
read-tre
e
: further loosen "working file will
b
e lost
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
J
un
i
o C Hamano
Merge branc
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2006-12-04
Ju
n
io C Ha
m
ano
unpack
-
trees: mak
e
sure "df_con
f
lict_entry
.
name" is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
J
unio C Hamano
rece
i
v
e
-pack: do n
o
t insist
o
n fast-forward outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hama
n
o
m
erge-recursive: u
s
e xdl
_
merge
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
xmerg
e
: m
a
ke return value from xdl
_
merge() mor
e
usable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C
Haman
o
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio C Hamano
git-merge: fix conf
u
sion
b
e
t
ween tag and bra
n
c
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge
m
as
t
er
.
kernel
.
org:
/
pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
M
erge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Hamano
t
utorial:
t
alk
a
b
o
u
t
user
.
name early and
d
o
n'
t
start
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio
C Hamano
Merg
e
branch 'jc/globf
e
tch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge
b
r
an
c
h '
m
aint'
commit
|
commitdiff
|
tree
next