repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master' into jc/fsck-reflog
2006-12-22
Ju
n
io C
H
amano
Merge bra
n
ch 'master' int
o
j
c
/fsck-refl
o
g
commit
|
commitdiff
|
tree
2006-12-22
Junio
C
Ha
m
ano
_XOPEN_SOU
R
C
E problem als
o
exists
o
n Fr
e
eB
S
D
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Haman
o
parse-
r
e
m
o
te
:
mark all refs not for merge
o
nly
wh
e
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Juni
o
C Hamano
Merge br
a
nch
'
m
a
in
t
'
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
Revert
"
gi
t
-
p
u
ll: ref
u
se defa
u
lt merge without branch
.
.
.
commit
|
commitdiff
|
tree
2006-12-21
Junio
C
Hamano
git re
f
log e
x
pire
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Junio C Haman
o
Move in_merge_bas
e
s(
)
to commit
.
c
commit
|
commitdiff
|
tree
2006-12-21
J
unio C
Hamano
ref
l
og: fix
warning m
e
ssage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Junio C Hamano
Tea
c
h git-repack to preserve objects referred t
o
by
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Junio C Hamano
Protect commits re
c
orded in
reflog f
r
om pr
u
ni
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
J
un
i
o C Ha
m
ano
add
f
o
r
_each_reflog
_
ent() iterator
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
J
unio C Ha
m
ano
Merge bran
c
h
'ew/svn-pm'
commit
|
commitdiff
|
tree
2006-12-20
J
unio C Hamano
d
iff
docu
m
entation:
mostly tal
k
a
bout
<comm
i
t>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merge
b
ranch 'j
c
/leftright'
commit
|
commitdiff
|
tree
2006-12-20
J
unio C Hama
n
o
Merge br
a
nch 'jc/bla
m
e
'
commit
|
commitdiff
|
tree
2006-12-20
J
u
n
i
o C Hamano
M
e
rge branch 'jc/branch-remove-re
m
o
t
e'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ha
m
ano
Me
r
g
e
b
ranch 'jc/clone'
commit
|
commitdiff
|
tree
2006-12-20
J
un
i
o C
H
a
mano
c
ompat/inet_nt
o
p: do n
o
t u
s
e u_int
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
J
u
nio C Hamano
s
p
urious
.
sp in manp
a
ges
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C Hamano
git-ad
d
:
error out when
given no a
r
gume
n
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
GIT 1
.
4
.
4
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
s
i
m
p
lify inclusion of
syste
m
h
e
ad
e
r
fil
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Haman
o
con
f
ig_rename_se
c
tion: fix F
I
LE* leak
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
fix
p
opulate-filespec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Ju
n
io C Ham
a
no
Rever
t
"Make l
e
ft-
r
ight a
u
tomatic
.
"
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C
H
aman
o
Use pre
p
roces
s
or
co
n
stants f
o
r environment va
r
iable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
un
i
o C Hamano
Do no
t
create $GIT_DIR/re
m
otes/ di
r
ectory
a
n
y
more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
Hama
n
o
Merge branch 'j
c
/
t
est-
c
lon
e
' into jc
/
clone
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
amano
Revert "fix testsuite:
make
sure they
u
se tem
p
lates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
blame: -b (b
l
ame
.
blankbound
a
ry) and --root (blame
.
showroot)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C Hamano
Teach git-branch to delete trac
k
ing
b
ranches with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C Hamano
fix testsuite:
make sure they use templates fre
s
hl
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio
C Hamano
r
e
rere: fix breaka
g
e of resolvin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
racy-g
i
t:
d
o
c
umentat
i
o
n updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C Hamano
show-r
e
f: f
i
x
-
-
exclude-existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C Hamano
pa
r
se-
r
emote::expand_re
f
s
_
wildcar
d
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
Hama
n
o
show-ref: fix --veri
f
y
-
-
ha
s
h
=
length
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
amano
s
how-ref: fix --qu
i
et
-
-verify
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge
b
r
a
nch 'jc
/
blame
-
boundary
'
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Hama
n
o
Mer
g
e
branch 'jc/
r
eflog' (
e
arly
p
art)
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Ha
m
ano
Merge branch 'js/
b
ranch
-
confi
g
'
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C Hamano
M
er
g
e branch 'jn/
w
eb' (ear
l
y part)
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Hamano
av
o
id acc
e
ss
i
ng
_
all
_
loose r
e
fs in git-
s
how-r
e
f -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Haman
o
git-fetch: A
v
oid reading packed refs
over and over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
a
m
ano
Teach show-branch how to show ref-log
data
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
am
a
no
Make l
e
ft
-
right automatic
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Ha
m
ano
T
each all of log family --left-right out
p
ut
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C
H
a
m
ano
rev-list --left-right
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hama
n
o
m
a
rkup f
i
x
in svnimport document
a
ti
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
J
u
nio C Hamano
Fix mis-
m
ark-u
p
in gi
t
-
m
erge-file
.
txt documenta
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io
C Haman
o
Fix ch
e
ck_
f
ile_directory_conflict()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Ha
m
ano
git-add: remov
e
conflicting entr
y
w
h
en a
d
d
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hamano
upd
a
te-index:
make
D/F
co
n
flict
e
rro
r
a
bit more ve
r
b
o
se
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
J
u
nio C H
a
mano
git-clone: los
e
t
he
tradi
t
ional 'no-separate-remote
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jun
i
o C
H
a
mano
git-clone: lo
s
e
the artifici
a
l "first" fetch refsp
e
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-pull: r
e
fuse default m
e
r
ge
w
i
thout branch
.
*
.
merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jun
i
o
C Hamano
g
i
t-c
l
one: use wildcard specification
f
or
t
r
ac
k
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
J
unio C H
a
ma
n
o
merge: give a bit prettier merge messa
g
e to "mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
Merge branch 'js/show'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Ha
m
ano
git-reset [--mixed] <t
r
ee>
[
--]
<
pa
t
hs>
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git-reset: ma
k
e it work
from within a su
b
director
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
J
unio C
H
amano
git-fetch
:
make it
w
or
k
from within
a
s
u
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C H
a
mano
Merg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
Update
g
it-diff docum
e
ntation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
Mer
g
e branch '
j
c/diff--cached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
g
it-s
v
n
: al
l
o
w both diff
.
color and col
o
r
.
d
iff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
c
onf
i
g documentation: group color items to
g
ether
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
g
i
t
-blame: s
h
ow lines a
t
tributed
t
o boun
d
ary commits
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge br
a
nch
'jc/read-t
r
ee-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
Merge b
r
anc
h
'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Me
r
ge branch 'np/a
d
dcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge
b
r
a
nch 'lh/branch-rename'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
Mer
g
e branch 'jc
/
commit-car
e
f
u
l'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
M
e
r
ge branch 'ap/cl
o
ne-
o
rigin'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C
H
amano
Merge branch 'jc/
n
umstat
'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
Ha
m
ano
Merge b
r
anch 'rr/cvsexportcom
m
it
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merg
e
branch
'
ap/branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
branch --color: c
h
ange defau
l
t c
o
l
or selection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io
C
Hamano
Merge
branch 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
s
e
nd
-
pack: tigh
t
en checks for remote
na
m
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Ha
m
a
no
gi
t
-push: accept ta
g
<tag> as advertised
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
s
p
u
r
ious
.
sp in man
p
ages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C
H
amano
git mer
g
e
: reword failure mess
a
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Re
v
ert "git-d
i
ff
:
In
t
roduce -
-
index a
n
d depr
e
cate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C H
a
ma
n
o
git-pu
s
h: d
o
cument rem
o
val
o
f
remote
ref with :<
d
st
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
M
e
r
ge branch 'mas
t
e
r
'
into js/merge
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
a
mano
M
erge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hama
n
o
a
dd test case
for
r
ec
u
r
sive me
r
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ham
a
no
d
i
f
f -
-
n
um
s
tat: show binary with '-' to match "appl
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C Hamano
s
h
ortlog
:
fix
s
e
g
fault
on empty aut
h
o
rname
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C Ham
a
no
short
l
og: remove "[PATCH]"
p
r
efix fro
m
sh
o
rtlog output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
io C Hama
n
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-10
Junio C Haman
o
git-c
o
mmit: allo
w
--only t
o
lose what
w
as
s
tag
e
d earlier
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Hamano
Docu
m
en
t
ation/git-commit:
r
ew
r
ite
to m
a
k
e it more end
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Junio C Hamano
g
i
t-rerere: ad
d
'gc'
comma
n
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Ham
a
no
F
ix perl/ build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio
C Ham
a
n
o
git-merge: fix "fix confu
s
ion
b
etween
t
ag and
b
ra
n
ch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next