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
Merge branch 'jc/diff--cached'
2006-12-14
Junio C Hamano
Merge bran
c
h
'
jc/diff--
c
a
c
hed'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-svn: allow both dif
f
.
col
o
r
an
d
color
.
diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Nicolas
P
i
t
re
re
p
a
c
ked packs should be read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
config
documentation: group colo
r
it
e
ms to
g
ether
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric
W
ong
git-
s
vn: correctly
h
andle "(no author)" w
h
e
n using
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
Merge branch 'jc/read-tr
e
e
-
ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
aman
o
Merge b
r
anch 'ew/rerer
e
'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hama
n
o
Merge bra
n
ch 'np/addc
o
mmit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Merge branch 'lh/bra
n
ch-ren
a
me'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
Merg
e
branch 'jc
/
comm
i
t-c
a
reful'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
Merge
b
ran
c
h
'ap/
c
lone-origin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merg
e
b
r
anch
'jc/numstat'
commit
|
commitdiff
|
tree
2006-12-13
J
unio
C
Hamano
Me
r
ge b
r
a
n
c
h
'rr/cv
s
e
x
portcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'ap
/
branc
h
'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
ama
n
o
b
r
a
n
ch --c
o
lor: cha
n
ge default color s
e
lectio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
J
uni
o
C Hamano
Merge br
a
nch 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
send-pack
:
t
i
ghten che
c
ks for remo
t
e names
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C H
a
mano
g
it-
p
ush: accept tag <t
a
g> as advertised
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Ham
a
no
spurio
u
s
.
sp in manpages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
gi
t
mer
g
e: rewor
d
f
ailur
e
m
essage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Shawn Pearce
R
emove unconteste
d
r
e
named files during merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C H
a
mano
Rev
e
r
t
"git-
d
i
ff: Intro
d
uce --index a
n
d deprecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-13
E
r
i
c Wong
g
it-svn: correctly disp
l
ay
f
atal
(
)
erro
r
messages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
E
ric Wong
git
-
svn: exit
w
ith status 1 for test fail
u
res
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Andy Parki
n
s
Allow subcommand
.
color and color
.
subcommand color
configuratio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io
C
Hamano
g
it-push
:
docume
n
t rem
o
va
l
of remote ref wi
t
h :<dst
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Joha
n
nes
S
chindel
i
n
merge-
r
ecurs
i
ve: add/
a
dd r
e
all
y
is modify/modify with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
aman
o
Merge bran
c
h 'mas
t
e
r
' into
js/merg
e
commit
|
commitdiff
|
tree
2006-12-13
Johannes Schi
n
de
l
in
Get
r
id of the d
e
pe
n
den
c
y
on RC
S
' me
r
ge pro
g
ram
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn:
corr
e
ctly handle pa
c
ked-
r
efs
i
n
refs/
r
emotes
/
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
am
a
no
add test c
a
se
f
or recursive
m
e
rge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric
Wong
g
i
t-svn: correc
t
ly dis
p
lay fatal()
er
r
or me
s
sages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eri
c
Wong
git-svn: a
l
lo
w
d
commi
t
to take an
a
lternate head
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric Won
g
git-svn: enable loggin
g
o
f
information not supporte
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Alex Riesen
Clarify fetch err
o
r for
m
issing obj
e
c
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
Brian Gernha
r
dt
Move Fink
and Ports check t
o
after
c
onfig file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
Andy Parkins
Colo
u
rise g
i
t-bran
c
h
o
utput
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
d
i
ff --numstat: show bi
n
ary with '-' to match "apply
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Robin Rosenberg
Make cv
s
e
x
p
or
t
c
om
m
it work w
i
t
h
filenames with spaces
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C Ham
a
no
shortlo
g
: fix segfau
l
t on e
m
pty authorname
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C
Hamano
s
hortlog: remo
v
e
"[P
A
TCH]" prefix from shortlog output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ha
m
ano
Merg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2006-12-11
Shaw
n
O
.
Pearce
Make su
r
e the emp
t
y tree exists w
h
e
n
n
eeded
in mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Jim Meyering
Don't u
s
e
mem
c
py
when source and dest
.
buffers
m
ay
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Chr
i
s
W
r
ight
no
need to install
manpag
e
s
a
s
executab
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Hamano
git-commit
:
allow
--only
t
o lose wha
t
was staged earlier
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Junio C
H
a
mano
Documentation/
g
it-com
m
it:
r
e
w
rite to make it
more end
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Eric
W
ong
rerere:
reco
r
d (or avoid misrec
o
rding
)
resolved
,
sk
i
pped
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Junio C Hamano
git-r
e
re
r
e: add 'gc
'
c
o
m
m
a
nd
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Eri
c
Wong
rerere: ad
d
cl
e
ar, dif
f
, and status c
o
mm
a
nd
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Bruce Fi
e
lds
Documentati
o
n:
simple
r
shared repository
c
re
a
t
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Je
f
f
King
shor
t
log: fix s
e
gfault on
empty aut
h
orname
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Jo
s
ef Weidendorfer
Add br
a
nch
.
*
.
merge warning and documentatio
n
up
d
ate
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Junio C
H
amano
Fix p
e
rl/
buil
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Eric
Wong
git-svn: u
s
e
do_switch for --follow-parent if the SVN
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Uwe Zeisbe
r
ger
Fix
d
oc
u
menta
t
ion copy&pa
s
te typo
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Eric Wong
g
i
t
-
svn: extra error
c
hec
k
to e
n
s
ure we open a
fi
l
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
J
.
Bruc
e
Fields
Documenta
t
ion
:
update git-clone m
a
n
p
a
ge w
i
th new b
e
havior
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
J
unio C Hamano
Merg
e
branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2006-12-07
Martin Langhoff
c
vsse
r
ver: Avoid miscounting
bytes in
P
erl
v5
.
8
.
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
Nicolas
P
itre
change
t
h
e unpack l
i
mit treshold to a saner value
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
J
.
Bruce Fields
Do
c
u
m
entatio
n
:
reorganize
cvs-migration
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Andy Parkins
Explicitly add the
d
efau
l
t "
g
i
t
pu
l
l" behaviour to
.
.
.
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
gi
t
-merge: fix "fix co
n
fusi
o
n b
e
t
w
een tag
and bran
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Er
i
c Wo
n
g
gi
t
-
svn: av
o
id
n
etwork
timeo
u
t
s for lo
n
g-running
f
etches
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Jakub Narebski
gitweb: Allow PNG, G
I
F, JPEG
i
mages to b
e
displayed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
am
a
no
git-merge: squelch needless
err
o
r messa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Haman
o
Merge
commit
|
commitdiff
|
tree
2006-12-06
J
uni
o
C Hamano
Me
r
ge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2006-12-06
J
unio
C
H
a
m
a
no
git-res
e
t to re
m
ove "$GIT_DIR/MERGE_MSG"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
J
o
hannes Sc
h
indelin
merge-file: suppor
t
-p
a
nd -q; fix compile warnings
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Joh
a
n
n
es
Schi
n
delin
Add
builtin merge-fi
l
e, a m
i
nimal replacement for RC
S
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
J
.
Bruce Fields
cvs
-
migratio
n
: improve
d
section
titles, better push
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Johann
e
s Schi
n
delin
cvs-migration document: make the nee
d
for "push"
more
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
L
ars Hjemli
gi
t
-branch: let caller spe
c
ify logmsg
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Lars Hjemli
rename_ref
:
u
s
e lsta
t
(2) when testing for symlink
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Lars Hjemli
git-branch
:
add options and tests
fo
r
branch r
e
namin
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
a
m
a
no
read
-
tr
e
e: doc
u
ment --exclude
-
p
er-di
r
ect
o
ry
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hamano
Loo
s
en
"
working file will be lost" check in
P
o
rcelain-ish
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
read-tr
e
e: further loosen
"wo
r
king file will be lost
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
J
ohannes Schindeli
n
x
d
l
_m
e
rg
e
(): fix and simplif
y
c
o
n
f
lic
t
handling
commit
|
commitdiff
|
tree
2006-12-05
Nicolas P
i
tre
ma
k
e
'
git add' a
f
irst
c
lass
user friendly
i
nt
e
rfa
c
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Jakub Narebsk
i
Document git-diff whitespace
f
lags -b and
-
w
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Johan
n
es Schindelin
d
iff -b: ign
o
re w
h
itesp
a
ce at end o
f
line
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Junio C Ha
m
ano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-04
J
unio C
H
a
mano
unp
a
ck-t
r
ees: make s
u
r
e
"df_conflict_entry
.
name" is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Ju
n
io C
Hamano
r
ece
i
v
e-pack:
d
o not in
s
i
s
t on f
a
st-
f
orward ou
t
side
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Michael
Loeffler
git-
f
etch: ignore dereferenced
t
ags
i
n e
x
pan
d
_refs_wildcard
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Jakub Narebski
g
it-clone: R
e
name --use-
i
mmingled-re
m
ote option to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Jakub
Narebski
git
w
eb: Fix A
t
om feed <logo>
:
it
i
s $logo
,
not $lo
g
o_url
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
A
l
ex Ries
e
n
Make p
e
r
l
/ build procedure ActiveState friend
l
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
David
Mille
r
Pas
s
-M to d
i
ff in req
u
est-pull
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Jim M
e
ye
r
in
g
Set permiss
i
ons of each new file before "c
v
s ad
d
"
i
ng it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Johannes Schin
d
elin
git-mv: sea
r
c
h
m
o
r
e pre
c
i
se
l
y f
o
r source di
r
ectory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Johannes
S
chindelin
xd
l
_merge(): fi
x
thi
n
k
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Johann
e
s
S
chindelin
xdl_merge(): fix an off-by-one
bug
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C Hamano
merge-recursive:
u
se xdl_merge()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C
Hama
n
o
xmerg
e
: make return value from
xdl
_
m
erge() more us
a
bl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next