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
Add a demonstration/test of customized merge.
2007-04-17
Junio C
Hamano
A
dd a demo
n
s
tratio
n
/test
o
f customized mer
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C H
a
mano
Allow specifying specialized merge-backen
d
per
p
ath
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
me
r
ge-recur
s
i
ve:
sep
a
rate out
x
dl_me
r
ge() interf
a
ce
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
H
a
m
ano
A
l
l
ow more t
h
an
t
rue/false
t
o
attribu
t
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
James
Bowes
Doc
u
ment
g
it-c
h
e
c
k-attr
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
uni
o
C Hamano
Change attribute ne
g
ation
m
arker from '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
D
e
f
ine a
b
uilt-in attribute
macro "binary
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hama
n
o
attribut
e
m
a
cro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Ma
k
efile:
add patch-id
s
.
h b
a
ck in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'di
f
f' a
t
tribute se
m
antics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Ham
a
no
Fi
x
'
crlf' att
r
i
bute s
e
m
an
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
H
amano
Teach 'd
i
ff'
about 'diff'
a
ttribu
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
ama
n
o
Define 'crlf' a
t
tribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
H
amano
Add basic in
f
rastructu
r
e
t
o assign attr
i
butes to
paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-14
Linus To
r
v
a
lds
git-quiltimp
o
rt
c
om
p
laini
n
g ye
t
s
till work
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenheld
c
o
nfig
.
txt: Fix grammatical error in descript
i
on of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank
L
i
c
h
tenheld
c
o
nfig
.
t
x
t: Ch
a
nge
pserver to server in
descriptio
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fran
k
Lichtenheld
conf
i
g
.
txt: Docu
m
e
n
t
c
ore
.
autocrlf
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fra
n
k
Lich
t
enheld
config
.
txt: Document gitcvs
.
a
l
l
b
inar
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Ham
a
no
D
o n
o
t de
f
ault to --no-index when given
two
d
irec
t
ories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Alex Riese
n
U
s
e r
e
v-list --reverse in git-rebase
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Merge
branch
'
jc/cher
r
y'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
Matthias Lederhofer
handle_options in g
i
t wrappe
r
m
i
scounts the options
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
Fix git {log,show
,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Shaw
n
O
.
Pearce
Do
n
't
yap about merge-subtree d
u
ring make
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
D
o
cu
m
entat
i
on: --ch
e
r
r
y-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
git-log -
-
cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refacto
r
pa
t
ch-
i
d
filtering out of git-c
h
e
r
r
y
and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--
p
r
e
tty=fo
r
mat:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
i
m Mey
e
ring
ssca
n
f/strt
o
u
l: parse integers
r
obu
s
tly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ro
b
in H
.
Johnson
Add testcase for fo
r
mat-pa
t
ch --subject
-
prefix (take 3)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
John
s
on
Add custom sub
j
ect prefix support to form
a
t-patch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
m
a
no
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Fr
a
nk
Lic
h
tenhel
d
cvsserver: F
i
x handling
o
f
diappear
e
d files on update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
uni
o
C Ha
m
a
no
fsck: d
o
not complain on
det
a
ched HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Ji
m
Meyering
(enc
o
de_85,
decode_
8
5): Mark sourc
e
buff
e
r
p
ointer
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Fran
k
Lichtenheld
git
w
eb:
A
l
low configur
i
ng the
d
efault pro
j
e
c
ts order
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Fran
k
Lichtenh
e
l
d
gitweb: Allow
f
o
r
ks
with
p
roject list file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hama
n
o
Merg
e
br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-10
Julian Phillips
Do
c
u
mentation: show-ref: do
c
ument --exc
l
u
de-existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
To
m
ash Br
e
chko
cvsexpo
r
tcommit -p : fix the usage of
git
-
apply -C
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
René Scharf
e
g
it
-
archive
:
m
a
ke tar
the defa
u
lt form
a
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
io
C
H
amano
Me
r
ge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
a
mano
Merg
e
br
a
nch 'jc/merg
e
-s
u
btree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C
Ham
a
no
Merge branch 'j
s
/fetch
-
progr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merge branch '
m
a
int
'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Ad
d
Docume
n
tation/cmd-list
.
made
t
o
.
giti
g
n
o
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn: fix
l
o
g
command to avoi
d
infinite loop on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
E
ric Wong
git-svn: d
c
o
m
mit/rebase confused
b
y
p
atches with git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-sv
n
:
bai
l
out on inc
o
rrect command-line o
p
tions
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Start 1
.
5
.
2
cycle
b
y
prepareing R
e
lNotes for
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
Merge branch 'jc/
r
ead
-
t
r
ee-df'
(
early part)
commit
|
commitdiff
|
tree
2007-04-08
J
uni
o
C Hamano
Merge
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prepare
f
or
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Frank Lichtenheld
cvsse
r
v
e
r: small correct
i
o
n
s
t
o asc
i
idoc
d
ocumentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new merge stragety 'subtr
e
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git
-
p
ush to multiple loc
a
tions does not stop at
t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Ham
a
n
o
gi
t
-push reports t
h
e URL a
f
t
e
r fai
l
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Merge
b
r
a
nc
h
'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Haman
o
Merge branch 'f
p
/make
-
j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge branc
h
'cc/bis
e
ct'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
bra
n
c
h 'jc/ch
e
ckout'
(
early pa
r
t
)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Me
r
ge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Documentation: tighten dependency for git
.
{html
,
txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
Make
f
ile
:
icon
v
() on
Darwin
has t
h
e
o
ld interfac
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarho
v
en
t
5
300-pac
k
-
o
b
je
c
t
.
sh:
p
ortabi
l
ity issue usin
g
/u
s
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
git-b
i
sec
t
: allow bise
c
t
i
ng wi
t
h on
l
y o
n
e bad c
o
m
m
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C
H
amano
t
6
030: add a bit more tests to git-b
i
sect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
t3200-branch
.
s
h
: small la
n
guage
n
i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arje
n
Laarhoven
u
serm
a
nual
.
txt: som
e
capital
i
za
t
ion nits
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars
Hjemli
Make builtin-branch
.
c
h
a
n
d
l
e the git config fi
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
L
ars Hjemli
rename_ref(
)
: only print a warning
w
hen config
-
file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Br
i
an Gernhar
d
t
Distinguish b
r
anch
e
s by more t
h
an case in tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIFUJI Hideak
i
.
.
.
A
v
o
i
d compos
i
ng too long "References" header
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenhe
l
d
cvsimp
o
rt
:
Improve formating co
n
s
i
stency
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Li
c
htenheld
cvsimport: R
e
order
o
ptions in documentation for better
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank L
i
cht
e
nheld
cvsimp
o
r
t
: Im
p
rove u
s
age erro
r
repo
r
ting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank
Lichte
n
held
cvsim
p
ort: Improve doc
u
mentatio
n
o
f
CVS
R
O
OT and CVS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimport: sy
n
c usage lines with
exi
s
ting options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Ju
n
io C H
a
m
ano
g
i
t
-
bisect: modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Merge branch '
m
a
i
n
t'
commit
|
commitdiff
|
tree
2007-04-05
Dana How
Fix
lsee
k
(2) calls wi
t
h args 2
a
nd 3 swa
p
ped
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ferna
n
do
J
.
P
ereda
Makefile:
A
dd '
+
'
t
o QUIET
_
SU
B
DIR0 to fix
parallel
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Christia
n
Couder
Doc
u
mentat
i
on: bis
e
ct
:
"star
t
" accepts one bad and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
C
hri
s
tian
C
ouder
Bisect: teach
"bisect st
a
rt" to opt
i
o
na
l
l
y
u
se one
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Alex Riesen
Fix
p
assing
of TCLTK_PATH to git-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Re
n
ame add_file_to_index
(
) to a
d
d_fi
l
e_to_cach
e
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
R
ename static variable wri
t
e_ind
e
x t
o
update
_
index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
amano
Re
n
ame interna
l
functi
o
n "add
_
file_to_cac
h
e" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C Hama
n
o
Propa
g
ate cac
h
e error internal
to r
e
fr
e
sh_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix b
o
gus
error message from merge-r
e
cursive e
r
ror
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Andy Parki
n
s
Show binary file size c
h
a
nge in
diff --st
a
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
Pea
r
ce
Honor
-
p
<
n
> when applyi
n
g
git diff
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C Hamano
Fix d
e
pend
e
n
cy of
common-
c
mds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
Pearce
Fix
lost
-
found to show comm
i
ts
o
nly refe
r
en
c
ed by reflogs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Nicolas Pitre
clean u
p
an
d
optimize n
t
h_packed_object_
s
ha1() us
a
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Geer
t
Bosch
Fi
x
ren
a
m
i
ng branch
w
i
t
h
o
ut config
f
ile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next