repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Simplify code to find recursive merge driver.
2007-04-19
Junio C Hama
n
o
S
im
p
lify
c
o
d
e
to find recurs
i
ve
merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o
C Hamano
Counto-fix in merge-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hama
n
o
Fi
x
funny types
u
sed in attribu
t
e
v
alue re
p
r
e
sent
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C Hamano
Allow low-le
v
e
l
drive
r
to specify diff
e
re
n
t
beh
a
vi
o
ur
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
C
ustom low-leve
l
merge driver:
cha
n
ge the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
A
l
l
ow the de
f
au
l
t low-level
merge
d
river to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-l
e
vel m
e
r
ge driver
support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
aman
o
Add
a
demonstratio
n
/tes
t
of c
u
stomized me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io
C
Hamano
Allow specify
i
ng
spec
i
ali
z
ed merge
-
b
a
c
ke
n
d
p
er path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Haman
o
merge-recursive: separa
t
e out xdl_merge
(
)
interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o C Ham
a
no
Allow more than true/false to attribut
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
James
Bowes
Docu
m
ent g
i
t-check-
a
t
tr
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Change att
r
ibute negation
mark
e
r
f
rom '!' to
'
-
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Define a built
-
in
a
ttrib
u
te
macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
a
ttribute m
a
cro su
p
p
or
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C
Hamano
M
akefil
e
:
ad
d
patch-i
d
s
.
h
back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
F
i
x
'di
f
f' at
t
ribute
s
emantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
Fix 'crlf' attrib
u
te se
m
a
n
t
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Teach 'diff' ab
o
ut 'd
i
ff'
a
ttr
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define '
c
rlf' attr
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Ham
a
no
Ad
d
b
a
s
ic inf
r
astructure to assi
g
n
a
ttributes to
p
a
t
hs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
Ham
a
no
Merge branch '
m
ai
n
t
'
commit
|
commitdiff
|
tree
2007-04-14
L
inus Torvalds
git-quiltimport complaining yet st
i
ll working
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank
L
i
chtenheld
config
.
txt: Fix
grammatical err
o
r in des
c
ription of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenheld
c
onfig
.
tx
t
: Change pserver to server in desc
r
ipt
i
on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenheld
co
n
fig
.
txt: Document core
.
au
t
o
c
r
lf
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank
L
ichtenheld
co
n
fig
.
txt:
D
ocument gitcvs
.
allbinary
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do not
d
efault to --no-index when
g
iven
two di
r
ectories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Alex Riesen
U
s
e rev-lis
t
--reverse in git-rebase
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Merge branch
'jc
/
ch
e
rr
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-13
M
a
t
thi
a
s Lederhofer
handle_options in g
i
t
wr
a
pper miscounts
t
he options
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
J
uni
o
C
Haman
o
Fix git {log,show,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Shawn O
.
Pearc
e
Don't y
a
p about merge-subtree
d
uring make
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Docu
m
entatio
n
:
--c
h
erry-
p
i
ck
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
git-log --cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Refactor patch-id filtering out of git-cher
r
y and
g
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Ad
d
%m to
'--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jim Meyerin
g
ssca
n
f
/
strtoul: pa
r
se i
n
t
e
gers robustly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Johnson
Ad
d
te
s
tcase for format-patch --su
b
ject-pref
i
x (t
a
k
e
3
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Johnson
Add c
u
stom subject
p
refix support to format-p
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C Hama
n
o
GIT
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Licht
e
nheld
cvsserver: Fix
h
andling of diappeared
f
iles on update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
f
sck: do not complain on det
a
c
h
ed HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Jim Meyering
(enco
d
e
_
85, d
e
code_85): Mark source
buffer pointer
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lichtenhe
l
d
g
i
tweb: Allow con
f
igurin
g
the def
a
ult proje
c
ts
o
rd
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
F
rank Lichtenheld
gitweb
:
A
l
low forks with project list
file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C Haman
o
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Julian Ph
i
llips
Docu
m
entat
i
on: show-r
e
f: d
o
c
u
m
e
nt --exclu
d
e-existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Tom
a
sh Brechko
c
v
sexport
c
o
m
mit -p : fix the usage o
f
git-apply -C
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
R
ené Scha
r
fe
g
i
t
-archive: make tar
t
h
e default format
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge
b
ran
c
h 'jc/push
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branc
h
'jc/m
e
rge-subt
r
ee'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Ham
a
no
M
e
rge branch
'
js/f
e
tch-p
r
ogress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hama
n
o
Add
D
o
cumen
t
at
i
on
/
cmd-list
.
made t
o
.
gitig
n
ore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
E
r
ic Wong
g
i
t-svn: fix log command to avoid infinite loop o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-sv
n
: dcommit/rebase
c
o
nfu
s
e
d
by pa
t
ches w
i
th git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
gi
t
-s
v
n: bail
out on incorrect comm
a
nd-l
i
ne optio
n
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
S
tart 1
.
5
.
2 cycle by prep
a
reing RelNotes for i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
Me
r
ge branch 'j
c
/read-tree-df'
(early part)
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Merge b
r
anc
h
'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prepare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
F
r
ank Lichtenheld
cvsserver:
s
mall corrections to a
s
ciidoc doc
u
mentatio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new me
r
ge strag
e
t
y 'subtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C H
a
mano
git-push t
o
multiple locations do
e
s not stop a
t
t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
git-
p
ush reports the URL
after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Mer
g
e branch 'jc/in
d
ex-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
Merge branch 'f
p
/
m
a
k
e
-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
M
e
rge branch 'cc/bi
s
ect'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
M
e
r
ge branch 'jc/ch
e
c
kout' (early pa
r
t
)
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Hamano
Docume
n
tati
o
n:
t
ig
h
ten depe
n
dency for
git
.
{html,txt
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laar
h
oven
Makefile
:
iconv
(
) o
n
Darwi
n
h
a
s the
o
ld interface
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen La
a
r
h
oven
t5300-
p
ack-object
.
sh
:
p
o
rt
a
bility is
s
ue us
i
ng
/
usr
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
g
i
t-bisect: allow bis
e
cting wi
t
h
o
n
ly
o
ne bad
commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
t
6030:
a
dd a bit mo
r
e
t
ests to
g
it-bisec
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen
Laarhoven
t
3200-b
r
anch
.
sh: smal
l
la
n
guage nit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
usermanual
.
txt: some capitaliza
t
ion nits
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars H
j
e
m
l
i
Ma
k
e
b
u
i
ltin-bra
n
ch
.
c handle the git config
f
ile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
rename_ref(): on
l
y p
r
i
n
t a warnin
g
when co
n
fig-file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
B
rian Ger
n
hardt
Distinguish branch
e
s
b
y more th
a
n ca
s
e
i
n tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIFUJI
H
ideaki
.
.
.
A
v
oid
c
o
mposing too long
"
R
eference
s
"
h
eader
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
F
r
ank Lichtenheld
cvsimport:
I
mprove fo
r
matin
g
consis
t
enc
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank L
i
chte
n
held
cvsim
p
ort: R
e
order options in documentation fo
r
bet
t
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank L
i
chtenhe
l
d
cvs
i
mport: Impr
o
ve usage error
r
eporting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fra
n
k
L
ich
t
enhel
d
cvsimpor
t
: Impro
v
e documentation of CVSROOT an
d
CVS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenh
e
ld
cvsi
m
port: sync usa
g
e
lines with
existing options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C
H
amano
git-bisect:
modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-05
Dana Ho
w
Fix ls
e
ek(2) calls with
args
2
a
nd 3 sw
a
p
p
ed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Fernando J
.
Per
e
da
Ma
k
efi
l
e: A
d
d '
+
'
t
o QU
I
ET_SUBDIR
0
to
f
ix parallel
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
C
hristian Coud
e
r
Do
c
u
m
entation:
b
isect: "start" a
c
c
epts one bad an
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Chr
i
stian Couder
Bisec
t
: te
a
c
h
"bisect start" to
o
p
t
ion
a
lly u
s
e on
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
A
l
ex Riesen
Fix passing o
f
TCLTK_PATH to git-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename
a
dd
_
file_to
_
index() to add_fil
e
_
to_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C
Hamano
R
ena
m
e static variable write_i
n
dex to up
d
ate_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Re
n
ame inte
r
nal function "add
_
file_
t
o_cache
"
in b
u
iltin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Propagate cache error
i
nternal to r
e
fr
e
s
h_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next