repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use git-merge-file in git-merge-one-file, too
2006-12-13
Junio
C Hama
n
o
git-b
l
ame: show line
s
a
t
t
r
ibuted to bound
a
r
y
commi
t
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge br
a
nch 'jc/
r
ead-tree-ig
n
ore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Me
r
ge
branch
'ew/rerer
e
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
i
o C
H
amano
M
e
rge bran
c
h 'n
p
/addcom
m
i
t
'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
Merge branch 'lh/b
r
anch-re
n
ame'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
io C Haman
o
M
er
g
e branch 'jc/co
m
m
i
t-careful'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
M
e
rge branch '
a
p/
c
lone-origin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Merg
e
bran
c
h
'
jc/
n
umstat'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C
H
amano
Merg
e
branch 'rr/cvsexportc
o
mmit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge bra
n
c
h
'ap/bra
n
ch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
branch --color: c
h
a
nge default col
o
r selec
t
i
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Haman
o
Merg
e
branch 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
send-pac
k
: tighten c
h
ecks
f
or re
m
ot
e
name
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
git-push: acc
e
pt tag <ta
g
> a
s
advertised
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
spuriou
s
.
s
p
i
n
manpages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git merg
e
: reword failu
r
e
messag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Shawn Pearce
Remove
u
n
contest
e
d renamed
f
iles during merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Revert "g
i
t-diff:
I
nt
r
oduce
--
i
nde
x
and de
p
recate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C
Ha
m
ano
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-13
E
ric Wong
git-svn: co
r
re
c
tly display fatal() error messages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric
Wo
n
g
git-svn: exit with status 1 fo
r
test fai
l
u
r
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Andy Parkins
Allow subcomma
n
d
.
color and color
.
sub
c
omm
a
nd col
o
r c
o
nfiguration
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
g
it-push: document r
e
moval of re
m
ote ref with
:
<
dst
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Johannes
S
chin
d
elin
merge-recu
r
siv
e
: add/add really is
m
odify/modify with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
i
o
C Hamano
M
e
rge branch 'm
a
ster' i
n
t
o
js/m
e
rge
commit
|
commitdiff
|
tree
2006-12-13
J
oh
a
nnes Schin
d
elin
Get rid o
f
t
he
dep
e
ndency on RCS
'
merge program
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric Won
g
git-svn:
c
or
r
ectl
y
handle packed-r
e
fs in refs
/
re
m
otes/
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
Merge
branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
add test case for
recursive me
r
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric
W
o
ng
git-
s
vn
:
c
o
rrect
l
y display fa
t
al() error me
s
sage
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eri
c
Wong
g
it-svn: allo
w
d
c
omm
i
t
t
o take an alterna
t
e head
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-
s
vn: e
n
able l
o
g
gin
g
of in
f
ormation not supported
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
A
l
e
x
R
i
esen
Cla
r
ify fetch
error f
o
r missing
o
bje
c
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
Bri
a
n Gernhardt
Mov
e
Fink and Ports check to after c
o
nfi
g
file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
Andy
P
arkins
C
o
lourise git-branch output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
J
a
kub Nare
b
ski
gitweb: SHA-1 in
c
ommit log
m
essa
g
e links to "obj
e
ct
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Nar
e
b
s
ki
g
itweb:
Hyperlin
k
ta
r
get o
f
s
ymbolic
link in "tree
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
Ja
k
ub Narebsk
i
gitweb: Add
ge
n
er
i
c git_ob
j
ect subrouti
n
e t
o
disp
l
a
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Narebski
gitwe
b
: Show
t
a
rget of sym
b
olic
l
i
nk in "tree" view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
J
ak
u
b
N
arebski
gitweb:
D
o
n't use Con
t
e
n
t-Encoding
:
head
e
r in git_
s
n
a
ps
h
o
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
d
i
f
f --
n
ums
t
at: show binary with '-' to m
a
tch "apply
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Ro
b
in Rosenbe
r
g
M
ake
c
vsexpo
r
tc
o
mmit work with file
n
ames with space
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
J
u
nio C Hamano
shortlog:
f
ix segf
a
u
lt on empty au
t
horna
m
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
short
l
o
g:
re
m
ove
"[P
A
TCH]" prefix
f
rom shortlo
g
output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
io
C
Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-11
S
h
awn O
.
Pearce
M
ak
e
sure the em
p
t
y
tree exists when
needed in merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Jim M
e
y
er
i
ng
Don't use memcp
y
w
h
en sour
c
e and dest
.
bu
f
fe
r
s may
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Chris Wri
g
h
t
n
o
n
eed to install ma
n
pa
g
es
as
executab
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Ham
a
no
git-commi
t
: allow --o
n
l
y to
lose what wa
s
sta
g
ed earlier
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
J
u
nio C Hamano
Docume
n
tation/git-comm
i
t: rewrite to make it
more end
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Er
i
c Wong
r
e
r
ere: re
c
ord (o
r
avoid misrecord
i
ng
)
r
e
so
l
ved,
skip
p
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Juni
o
C Hamano
git
-
rerere: a
d
d
'gc' command
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Eric Wong
rerere:
add cl
e
ar,
diff, an
d
sta
t
us com
m
ands
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Bruc
e
Fields
Docum
e
n
tatio
n
: simpl
e
r
shared repository creation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Jeff Ki
n
g
sh
o
r
tlog: fix se
g
fau
l
t on e
m
pty aut
h
orna
m
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Josef Weidendorfer
Add
b
ranch
.
*
.
merge
w
arning and docu
m
en
t
ation u
p
date
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
Er
i
c W
o
ng
git-svn
:
use
do_sw
i
t
ch for --foll
o
w-p
a
ren
t
if the
S
VN
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Uwe Zeisb
e
rger
Fix documentation copy&pa
s
te typo
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Eric Wo
n
g
git-svn: extr
a
error chec
k
to
e
nsure we open a file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
J
.
Bruce Fields
D
ocumentation: updat
e
git-clone man
p
a
ge with new behavior
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
J
u
n
io
C
Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-07
Martin L
a
nghoff
cvsserv
e
r: Avoid mis
c
o
u
nting bytes in Perl v5
.
8
.
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
Nicolas Pitre
chang
e
the unpack lim
i
t tr
e
shold to a sa
n
e
r value
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
J
.
Bruce
Fi
e
l
ds
Documentati
o
n: reorganize
c
v
s
-mi
g
r
a
tion
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Andy Par
k
ins
E
x
plicitly add the default "git pull" behavi
o
u
r
to
.
.
.
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ham
a
n
o
g
it-
m
erge: fix "fix
confusi
o
n
betwee
n
tag and branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Er
i
c Wong
g
i
t
-
svn:
avoid
n
etwork time
o
uts f
o
r lon
g
-running fetches
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Jakub
N
arebski
gi
t
w
eb
:
A
ll
o
w
P
NG, GIF, JPE
G
images
t
o be d
i
sp
l
ayed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hamano
git-merg
e
: squelch needless
error me
s
sage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
J
unio
C
Ha
m
ano
M
e
rge
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C Hamano
M
erge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
g
it-reset to remov
e
"$G
I
T_DIR/MERGE_MSG"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schinde
l
in
merge-fi
l
e: support -p
a
nd -q
;
fix compile warn
i
ngs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Johanne
s
Sch
i
ndel
i
n
Add bui
l
tin merge-
f
ile, a minimal replacement for RCS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
J
.
Bruce Fields
cvs-migration
:
impr
o
ved se
c
tion titles, better
push
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Sch
i
ndel
i
n
cvs-migration doc
u
ment: make the
n
e
ed for
"
p
u
sh
"
mor
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
La
r
s Hjemli
git-bran
c
h: let caller s
p
ec
i
fy logmsg
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Lars H
j
emli
rename_ref: use lstat(2) w
h
e
n
testing for syml
i
nk
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
La
r
s Hjemli
git-bran
c
h:
add op
t
ions
a
nd tests for bra
n
ch renaming
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
J
u
n
i
o C Hamano
read-tr
e
e
:
document --ex
c
l
ude-
p
e
r
-direc
t
or
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ha
m
ano
L
o
osen
"
working file
will
be
l
ost" check in P
o
rce
l
a
i
n-ish
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hama
n
o
read-tree: fur
t
her loos
e
n "
w
orking fil
e
wi
l
l be lost
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Jo
h
anne
s
S
c
hindeli
n
x
d
l_m
e
r
g
e():
f
ix
a
n
d
simplify
c
onflict handl
i
ng
commit
|
commitdiff
|
tree
2006-12-05
Nicolas Pitre
make 'git add' a fir
s
t clas
s
us
e
r friendly int
e
rface
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Ja
k
u
b
Narebski
Document git-diff whit
e
spa
c
e flags -b and -w
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Johan
n
es Schindelin
diff -b:
ignore whitespa
c
e at end of line
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Ju
n
io C Hamano
M
erg
e
branc
h
'm
a
int
'
commit
|
commitdiff
|
tree
2006-12-04
Junio C H
a
mano
unpac
k
-tree
s
: make sure "df_conflict_en
t
ry
.
n
ame"
is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Junio
C
H
a
mano
receive-
p
a
ck: do
not insist on f
a
st
-
forward outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Michael Loeffler
git-fetch: i
g
nore
der
e
ferenced tags in expand_refs_wildc
a
rd
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Ja
k
ub Nare
b
ski
git
-
c
lone:
Rena
m
e
--u
s
e-
i
m
mi
n
gled-remote option to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Jakub Nare
b
sk
i
gitweb: Fix Atom feed <l
o
go>: it is $log
o
, not $logo_url
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Alex
R
ie
s
e
n
Mak
e
perl/
build
procedur
e
ActiveState friendly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Dav
i
d
Miller
Pa
s
s
-
M to diff i
n
req
u
est-pull
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Jim Meyering
Set
p
ermissions of each new fil
e
before
"cvs add"ing
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Joha
n
nes Schindelin
g
i
t
-mv: search more p
r
eci
s
ely fo
r
source di
r
e
ctory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Johann
e
s Schind
e
l
i
n
xd
l
_merge(): fix thinko
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Johannes
S
chindelin
xdl_
m
erge():
f
i
x
a
n
off-by-one
b
u
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Ju
n
io C Hamano
merge-recursiv
e
: use
x
d
l_merg
e
()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next