repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-pull: refuse default merge without branch.*.merge
2006-12-16
J
u
nio
C
H
a
mano
git-pull: re
f
use
defau
l
t
m
erg
e
w
i
thout
b
ranch
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
u
nio C
H
amano
git-clone: use wildc
a
r
d
s
pecification for
tr
a
cking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
uni
o
C Hamano
me
r
ge: giv
e
a bit
p
retti
e
r m
e
rge messa
g
e to "merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johannes
S
chindelin
Document git
-
m
e
rge-file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Qu
y
To
n
that
git-clon
e
documentati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Andy Parkins
git-sta
t
u
s
a
lwa
y
s says what
branch
it
'
s on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
P
e
arce
Align
secti
o
n head
e
rs of '
g
it sta
t
u
s' to new 'git add'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
S
h
awn O
.
Pearce
Sugge
s
t us
e
of "
g
i
t add file1 f
i
le2
"
when there is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Brian Ger
n
hardt
Make
g
it-diff documentation
use [--] when
i
t sho
u
l
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
B
r
ian G
e
rnhardt
Add --add op
t
ion to git-repo-co
n
fi
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shaw
n
O
.
P
earce
Teach ba
s
h th
e
new features of 'git show'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Luben Tuik
o
v
Exp
o
rt PERL_PATH
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shaw
n
O
.
Pearce
Enabl
e
reflogs
b
y
default in any repository with a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn
O
.
Pearce
Provide more meaningful output fr
o
m 'git i
n
it-db'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Nicolas Pitre
make commit message a
l
i
tt
l
e more
consi
s
tent
a
n
d c
o
nfor
t
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Sha
w
n O
.
Pearce
Avoid acc
e
ssing a slow wor
k
i
n
g
copy during diffcore
.
.
.
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
Johannes
S
c
h
in
d
elin
g
i
t-show: grok blo
b
s,
t
rees and t
a
gs, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
un
i
o C Hamano
gi
t
-reset [-
-
mixe
d
] <tree
>
[
--
]
<paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
g
i
t-
r
eset:
m
a
ke
i
t w
o
r
k
from within a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Ham
a
no
git-fetch: make it work fr
o
m
w
ithin a subdi
r
ecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Joha
n
nes Sch
i
ndelin
INSTALL: no ne
e
d to have
G
NU diff installed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
H
a
mano
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-14
Sha
w
n O
.
P
earce
Bypass expe
n
sive
con
t
ent comparsion du
r
i
n
g
r
e
name detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C Ha
m
a
no
Update git-d
i
ff do
c
um
e
ntation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
H
a
m
ano
Merge
bra
n
c
h 'jc/diff
-
-
cached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Haman
o
gi
t
-svn:
a
l
l
ow bo
t
h diff
.
color an
d
color
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
N
i
colas Pitre
repacked
packs should
be rea
d
-o
n
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
co
n
fi
g
documentatio
n
:
g
roup color items tog
e
t
h
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-s
v
n: corre
c
tly hand
l
e "(n
o
author)"
w
hen using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'
jc
/
read-tree-i
g
nore'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
Merge
b
ranch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge br
a
nch 'np/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge branc
h
'
l
h/branc
h
-rename'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Me
r
g
e branch 'jc/commit-careful
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Merge bran
c
h 'ap/clone-orig
i
n'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C H
a
m
a
no
Me
r
ge
b
r
anch 'jc/numstat
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'rr/cvsexportcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
a
n
o
Merg
e
br
a
nch 'ap/
b
ran
c
h'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
H
amano
branch
-
-co
l
or: chang
e
default color se
l
ec
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge branch 'js/me
r
ge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
send-pack:
tigh
t
en checks for rem
o
te nam
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-
p
ush: a
c
cep
t
tag <tag> as advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
sp
u
rious
.
sp in
m
anpage
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
git merge:
r
eword failure
m
essa
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
S
hawn
P
earce
R
em
o
ve u
n
contested renamed
fi
l
es during m
e
rge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C Hamano
Revert
"gi
t
-
d
i
ff: Introduce --index and depr
e
cate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
M
e
rge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
g
it-sv
n
: corre
c
t
l
y
d
i
s
p
l
a
y fata
l
()
e
rro
r
messages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric W
o
ng
git-sv
n
: exit with st
a
tus 1 for test
f
ailures
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Andy P
a
rkins
Allow subcomman
d
.
color
a
nd color
.
s
ubcommand color
c
onfigu
r
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
gi
t
-p
u
sh: d
o
cum
e
n
t removal of remote ref wit
h
:<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Johanne
s
Schi
n
del
i
n
merge-recursive: add/add really is modify/modify with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
Merge br
a
nch 'mast
e
r'
i
nto js
/
m
er
g
e
commit
|
commitdiff
|
tree
2006-12-13
Joh
a
n
n
e
s
Schindelin
Get rid
o
f the depende
n
c
y on R
C
S
'
m
e
rge program
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic Wong
g
it-svn: correctl
y
h
andle packed
-
refs in
r
efs/
r
emotes/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
J
uni
o
C Hama
n
o
add t
e
st case for recu
r
sive merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic Wong
g
it-svn: correctly display f
a
tal()
error mes
s
ages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn: allow dcom
m
i
t
to
t
ake an alternate he
a
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
g
i
t-svn: e
n
able l
o
g
g
ing of info
r
mation
n
ot support
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Alex
Ries
e
n
Clar
i
fy
fetch error f
o
r missing objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
B
r
i
a
n
G
ernhardt
Move Fink and Po
r
t
s
che
c
k t
o
after config fil
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Andy Parkins
Co
l
ourise git-bran
c
h
outpu
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C
H
amano
diff --n
u
mstat: s
h
ow binary wi
t
h '-' to ma
t
ch
"
ap
p
ly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Robi
n
Rosenberg
Make cvse
x
portcommit wo
r
k
with fi
l
e
names with spaces
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
shortl
o
g
: fix segfault
on empt
y
a
u
t
h
o
rnam
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Juni
o
C Hamano
s
h
o
rtlog: remo
v
e "[PATCH]" prefix from
shortlo
g
o
utput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2006-12-11
S
h
awn O
.
P
e
arce
Make
sure the e
m
pty t
r
ee exists wh
e
n neede
d
in me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
im Meyering
Don'
t
use memcpy w
h
en source and d
e
st
.
buffers m
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Chris Wright
no n
e
ed to install m
a
npages a
s
e
x
ecutable
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Ha
m
a
n
o
g
i
t-commit
:
a
l
l
ow --onl
y
to lose what was stag
e
d earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio
C
Hamano
Docum
e
ntation/git
-
commit:
rew
r
i
t
e
to make it
more
en
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
E
r
ic Wong
rer
e
re: record (
o
r avoi
d
misr
e
cording) resolved,
skipped
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio C Hamano
git-rerere: add
'gc' command
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Eric Won
g
rerere: add clear,
diff, and
s
ta
t
us commands
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Bruce Fi
e
lds
Documentatio
n
: simp
l
er shared
repository
c
reation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Jeff King
s
h
ortlog: fix segfault on empty
a
uthorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Josef Weidend
o
rf
e
r
A
d
d
bra
n
ch
.
*
.
merge warni
n
g
a
nd do
c
umenta
t
i
on update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Hamano
Fix perl/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Eric
W
ong
g
it-s
v
n
: use do_switch for --foll
o
w-parent
if the
SVN
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
U
we
Zeis
b
e
r
ger
Fix documentation copy&paste typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Eric Won
g
git-svn: ex
t
r
a
error
c
heck to ensure we open a
file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
.
Bruc
e
Fields
D
o
cumentation: upda
t
e g
i
t-clone man page with new behavior
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-07
Mart
i
n Langhoff
cvsserv
e
r: Avoid misco
u
nting
b
ytes
in
Pe
r
l v5
.
8
.
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
N
i
colas Pitre
c
h
ange the unpa
c
k limit
tresh
o
ld
to a
s
an
e
r value
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
.
Bruc
e
Fie
l
ds
Docume
n
ta
t
ion: reorga
n
ize
cvs-migra
t
ion
.
t
x
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Andy Parkin
s
Explicitly a
d
d the defau
l
t
"git pul
l
" behaviour t
o
.
.
.
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio C Ham
a
no
git-mer
g
e
: f
i
x "fix conf
u
sion be
t
w
e
en
t
ag and b
r
anch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
E
ric Wong
git-svn: avoid network timeouts for long-run
n
ing fet
c
hes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jakub Narebski
g
itweb:
Allow PNG, GIF, JPE
G
i
mages to be disp
l
a
y
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C Hamano
git-merge
:
s
quelch ne
e
dless error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio C Hamano
Me
r
ge
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o
C
H
amano
Merge branc
h
'm
a
i
n
t'
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o
C
Hamano
git-reset to
r
emov
e
"$
G
IT_DIR
/
MER
G
E_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
o
h
annes Schindelin
merge-file: support -p an
d
-q; fix compile
w
arning
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Johannes
Sc
h
indelin
Add bu
i
ltin mer
g
e-
f
ile, a minimal replacement fo
r
R
C
S
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
.
Bruce
F
ields
cvs-migr
a
tion: improve
d
section
ti
t
les, bett
e
r push
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next