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
Counto-fix in merge-recursive
2007-04-19
J
u
nio C Hamano
Counto-fix
i
n
merg
e
-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hama
n
o
Fix fu
n
ny types use
d
i
n attr
i
bute
v
alue
r
epresentati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low-leve
l
driver to spe
c
ify di
f
ferent behavio
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Cus
t
om low-lev
e
l
merg
e
driver: change the confi
g
urati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Haman
o
A
llow the default low-level
m
e
r
ge driver to b
e
configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C H
a
m
a
no
Cu
s
tom l
o
w-leve
l
merge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a d
e
mon
s
t
r
a
t
i
on/t
e
st of
c
ustomized
merg
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C H
a
ma
n
o
Allow speci
f
y
ing s
p
ecialized
m
erg
e
-
b
ack
e
nd per p
a
th
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
merg
e
-
rec
u
rsive:
separate
out
x
dl_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Haman
o
A
l
l
o
w more than
t
r
ue/fal
s
e
to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
ames Bowes
Document git-che
c
k-attr
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Cha
n
g
e attribute negatio
n
marker from '!' to
'-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Defin
e
a
buil
t
-in attri
b
ute
macro "
b
in
a
ry"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
att
r
ibute mac
r
o support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
Ma
k
efile: ad
d
patch-ids
.
h back
i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix
'diff' attribut
e
se
m
ant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
Fix 'crlf' attribute sem
a
n
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C
H
a
m
an
o
Teach '
d
iff' about 'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
Define 'c
r
lf' at
t
r
ibu
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add basic infrast
r
uct
u
re to assign attributes to pat
h
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Merge
b
r
anc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-14
Linus Torvalds
gi
t
-
q
uiltim
p
o
r
t
compla
i
ning yet stil
l
w
orking
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fran
k
Lichtenheld
config
.
t
xt: Fix grammatical
error in descriptio
n
of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank
L
ichtenheld
c
onfig
.
txt: Change pserver to ser
v
er i
n
descr
i
ption
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank
Lic
h
tenhel
d
config
.
txt: Docu
m
e
n
t core
.
auto
c
r
l
f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
F
r
a
n
k Lichte
n
h
eld
config
.
t
x
t: Document gitcvs
.
al
l
binary
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Do
n
ot default to --no-index
w
hen given two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
A
l
ex Riesen
Use re
v
-
li
s
t --reverse
i
n git-rebase
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C
Hamano
Merge br
a
nc
h
'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
M
e
rg
e
branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-13
Matthias L
e
derhofe
r
handle
_
o
p
tions i
n
git wrapper miscoun
t
s the options
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {log,show
,
.
.
.
} --
p
retty=ema
i
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Shawn
O
.
P
ea
r
ce
D
o
n't
y
ap about
merge-
s
ubtree during make
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Docu
m
en
t
ation: -
-
cherr
y
-
p
ick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
gi
t
-log --cherry
-
p
ick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
Refactor p
a
tch-id filtering
o
ut of
g
it
-
cherry
a
n
d gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
Ad
d
%m to '-
-
pr
e
tty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jim Mey
e
ring
ssca
n
f/strtoul: parse integ
e
rs
r
o
bustly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Johnson
Add testcase for forma
t
-patch -
-
subj
e
c
t
-prefix (take 3)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Rob
i
n H
.
Johnson
Add custo
m
s
ubject
p
r
e
fix support t
o
format-patch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merg
e
bran
c
h 'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lichtenheld
cvsse
r
ver: Fix handling of diappea
r
ed fil
e
s on update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Jun
i
o C Haman
o
fs
c
k
: do not complain
o
n
d
et
a
ched
H
E
A
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Jim Meyering
(enco
d
e
_
8
5
, decod
e
_
8
5): Mark source buffer pointer
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lic
h
t
enheld
gitweb: Allow config
u
r
i
ng t
h
e defaul
t
p
rojects ord
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lichte
n
held
g
itweb: Allow
fork
s
with p
r
o
j
ect list file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hama
n
o
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-10
Julian Phi
l
l
i
ps
D
ocumentation: show-ref:
d
oc
u
me
n
t
--exclude
-
exi
s
ting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
To
m
ash Brech
k
o
cvsex
p
ortc
o
mmit -p :
fix the usage of git
-
appl
y
-C
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
René Scharfe
git-archiv
e
: make t
a
r
the de
f
aul
t
f
or
m
at
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Merge br
a
nch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
Hamano
Merg
e
branc
h
'jc/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
H
a
mano
M
erge
b
ranc
h
'
j
s/f
e
tch-progres
s
'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
Merge b
r
an
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Documentation/c
m
d-list
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Won
g
gi
t
-s
v
n: fix log c
o
mmand to avoid infinite
l
oop on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
gi
t
-svn: dcommi
t
/rebase conf
u
sed by patches
w
i
th
g
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
g
it-svn: bail out
o
n inc
o
rrect command-line opt
i
ons
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Haman
o
S
t
art 1
.
5
.
2 cycle by pr
e
pareing RelNotes
f
or
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge b
r
anch 'jc/read-tree-
d
f' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
Prepa
r
e for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Fra
n
k Licht
e
n
h
eld
cvsserver: small corre
c
tions to asciidoc documenta
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ham
a
no
A
n
ew merge strag
e
ty
'subtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
Hamano
git-push to mul
t
iple loc
a
tions does not st
o
p at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
gi
t
-push reports
th
e
URL
after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
b
r
anch 'jc/
i
ndex-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ham
a
no
Merge bra
n
ch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Mer
g
e branc
h
'jc/checkou
t
'
(early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
man
o
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Documentat
i
o
n: tighten d
e
pendency for git
.
{html,tx
t
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laar
h
ove
n
M
a
kefile: iconv(
)
o
n Darwin has the old interface
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arje
n
Laa
r
ho
v
en
t5300-pa
c
k-object
.
sh: portabi
l
it
y
issue using /
u
s
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
g
i
t-bis
e
ct: allow bisecting with only one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ham
a
n
o
t6030:
add a bit
more tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ar
j
en Laarhov
e
n
t3200-branch
.
sh: small language
n
i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
usermanual
.
txt: some capital
i
z
a
tion nits
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
L
a
rs Hjeml
i
Make builtin
-
br
a
nch
.
c handle the gi
t
conf
i
g file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lar
s
Hj
e
mli
rename_re
f
(): only print
a wa
r
ning
w
hen
config-file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Brian Gernhardt
Distinguish b
r
anches b
y
more than
case in tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIF
U
JI Hideaki
.
.
.
Avoid compo
s
i
n
g too long
"Refe
r
ences" he
a
der
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fran
k
Lichtenhe
l
d
cvsimport: Improve formating co
n
si
s
tency
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
F
ra
n
k Lichtenhe
l
d
c
v
simport: Reorder options in d
o
cumenta
t
ion for
b
etter
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank
Li
c
htenheld
cvs
i
mport: Improve usage
error reporting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fr
a
nk L
i
chtenheld
cvsim
p
ort: Improv
e
d
o
c
umentation of
C
VSROOT and CVS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Li
c
hten
h
el
d
cvsimp
o
r
t: sync
u
s
age lines w
i
th exi
s
t
ing options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C
H
a
mano
git-bisec
t
: mod
e
rnizati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hama
n
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Dana How
Fix lse
e
k(2) calls
w
i
th args 2 and 3 sw
a
p
ped
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Fernan
d
o J
.
Pereda
M
a
k
efile: A
d
d
'+' to Q
U
IET_SUBDIR0
to fix parallel
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
C
hristian Couder
D
o
cumentation
:
bisect: "start"
a
c
cepts one
b
a
d and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ch
r
istian Couder
Bisect: teach
"
bi
s
ect s
t
art" to op
t
i
onally us
e
one
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Alex Ri
e
sen
Fi
x
passing of TCLTK_
P
A
T
H to git-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Rename add_file_to_
i
ndex()
t
o
add_fi
l
e
_
to_
c
ach
e
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rena
m
e stat
i
c variable writ
e
_index to update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hama
n
o
Renam
e
inte
r
n
a
l fun
c
tion "
a
dd_file_to_cac
h
e" in built
i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
P
ropagate cache
e
rror internal to
r
ef
r
esh_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C
Hamano
Fix
bogus error message from
m
e
rge-recursi
v
e er
r
or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next