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
Custom low-level merge driver: change the configuration scheme.
2007-04-18
Junio C Hama
n
o
Custom low-lev
e
l mer
g
e
drive
r
:
c
h
ang
e
th
e
configurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hama
n
o
Allow the defa
u
lt
l
o
w-level mer
g
e
dr
i
ver to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
C
ustom low-level
m
erge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
Add
a demons
t
rat
i
on/test of
customized
m
erge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow s
p
ecifyin
g
spe
c
ial
i
zed merge-backend per
p
ath
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
H
a
mano
m
e
rge-rec
u
rsi
v
e
: se
p
arate out xdl_m
e
rge() interfac
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
All
o
w more than
true/false to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jame
s
Bowe
s
Docume
n
t
gi
t
-
check-attr
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio
C
Hamano
Change attr
i
bute neg
a
tion marker from
'
!' to
'
-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C
H
amano
De
f
i
ne a b
u
ilt-in at
t
ribute macro "b
i
n
ary
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C
H
amano
attri
b
ute
m
a
cro s
u
pport
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Makefile:
a
dd patch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C
Hama
n
o
Fi
x
'diff' at
t
ribute semanti
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Fix 'crlf' attribute sem
a
nt
i
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hama
n
o
T
e
ach 'd
i
ff' about 'diff' a
t
trib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C
H
amano
Defi
n
e 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add basic infrastructure to a
s
sign attri
b
utes
t
o paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Linus Torv
a
lds
git-quiltimport
c
omplaining yet still wo
r
king
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenheld
config
.
txt: Fix g
r
amma
t
ical error in descript
i
on of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenh
e
ld
c
o
nfig
.
t
x
t:
C
han
g
e
p
server
t
o server in d
e
scri
p
tion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenheld
config
.
txt: Document
c
ore
.
autocrlf
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenheld
config
.
txt: Do
c
ument gitcvs
.
allbinary
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C H
a
mano
Do not default to -
-
no-
i
ndex
w
hen given two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Alex Riesen
Use rev-list -
-
r
e
verse in git-rebase
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Me
r
ge branch 'jc
/
ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
i
o
C
H
a
mano
Merge branc
h
'm
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-13
Mat
t
hias L
e
derhofer
handle_opt
i
ons
in git wrapper miscoun
t
s th
e
options
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
i
o
C Hamano
Fi
x
git {log,sh
o
w,
.
.
.
} --p
r
e
t
t
y=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Shawn O
.
Pe
a
rce
Don't yap about
merge-subtree during make
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Doc
u
m
e
ntation: -
-
cher
r
y
-
pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
g
it-log
-
-cherry-pick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor patch-id filterin
g
o
ut of
gi
t
-
cher
r
y and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
Add %m
t
o '--pretty
=
format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jim Meyering
sscanf/
s
trtoul
:
parse int
e
g
ers robustly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ro
b
in H
.
Jo
h
nson
Add testc
a
se
for
f
ormat-patch --s
u
bject-pref
i
x
(take 3)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Johns
o
n
Ad
d
c
ustom subje
c
t prefix support to format-p
a
tc
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
G
IT
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank
L
ichtenheld
cvs
s
erv
e
r: Fix
h
a
n
dling of diappeared file
s
on update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio
C
H
amano
fsck:
do not complain on detached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Jim Meyering
(en
c
ode_85, de
c
ode_85): Mark source buffer poi
n
t
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Fran
k
Lichtenheld
gitweb:
A
l
low configur
i
ng th
e
default projects order
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lichten
h
e
l
d
gitweb: All
o
w forks with project list fi
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
uni
o
C
Hamano
M
erg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-10
Jul
i
an Phillips
Documentation:
s
how-
r
ef:
document
--exc
l
ude-existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Tomash Brechk
o
cvsexportcommit
-
p
:
fix th
e
usage of
git-a
p
ply -
C
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
R
ené Sc
h
a
r
fe
git-archive: make
ta
r
the def
a
ult
form
a
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Merge branch
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'jc/merge
-
subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merge b
r
a
n
ch
'js/
f
e
tch-progr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Add
D
ocumentation/cmd-list
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
g
i
t-
s
vn
:
fix l
o
g command to avoid inf
i
n
i
t
e
loop
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Er
i
c Wong
git
-
svn: dcommit
/
r
ebase
c
onfused 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
git-svn: ba
i
l out on
i
ncorre
c
t comm
a
nd
-
line
options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
S
t
art 1
.
5
.
2 cycle
by pre
p
areing RelNote
s
for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
H
amano
Merge branc
h
'jc/read-tree-d
f
' (e
a
rly par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
M
e
r
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C
H
am
a
no
Prepare f
o
r
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Frank Li
c
htenhel
d
cvsser
v
er
:
small
c
orrections to asc
i
i
d
o
c
doc
u
m
e
ntat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A ne
w
merge s
t
rage
t
y
'subtree
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push t
o
multiple locati
o
ns do
e
s not stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
git-push reports the URL after f
a
iling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ham
a
n
o
Merge b
r
a
n
ch
'j
c
/
i
ndex-output'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
H
amano
Mer
g
e branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Mer
g
e branch 'cc/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
mano
Merge branch 'j
c
/checkout' (early pa
r
t)
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
Hamano
M
e
r
g
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Documentation: ti
g
h
ten depen
d
ency for g
i
t
.
{
h
t
m
l
,txt
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen La
a
rh
o
ven
M
ak
e
fil
e
: iconv() on Dar
w
in has the old inter
f
ace
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
A
r
jen
Laarhoven
t
5300-pack-object
.
s
h
: po
r
tabilit
y
issue using /usr
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
git-bise
c
t: allow
b
isecting wi
t
h only
one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
t6030: add
a
bit m
o
re tes
t
s to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
A
rjen Laarhoven
t3200-branc
h
.
sh:
s
mall language nit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
A
rjen L
a
arho
v
en
usermanual
.
txt: some capi
t
a
liz
a
tion ni
t
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars
Hj
e
m
l
i
Make builtin-branch
.
c
h
andle
t
he git c
o
n
f
i
g file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
r
ename_re
f
(): o
n
ly
p
rin
t
a warning wh
e
n co
n
fi
g
-file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Br
i
an Gernhardt
Distinguish br
a
nc
h
es by more
than case in tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIFUJI Hideaki
.
.
.
A
v
oid composin
g
t
o
o long "Referen
c
es"
h
ead
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
c
v
simport: Improve f
o
rmating
con
s
istency
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lic
h
tenheld
c
vs
i
m
p
ort: Reorder
options i
n
documentati
o
n for be
t
ter
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fr
a
n
k Lichten
h
e
l
d
cvs
i
mport: Improve usage err
o
r rep
o
r
t
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank
L
ich
t
enhel
d
c
vsimport:
I
mprove docum
e
ntation of C
V
SROOT and CVS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lic
h
tenheld
c
vsimport: sync usage li
n
es wit
h
existin
g
options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Juni
o
C H
a
ma
n
o
g
it
-
bisect: modern
i
zati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C
Hamano
M
e
r
ge
b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-05
Dana How
Fix ls
e
e
k(2) calls with args 2 and 3 sw
a
pped
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Fer
n
ando J
.
P
e
reda
Makefile: Add '+' to QUIET_SUBDIR0
t
o fix parallel
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Christian Coud
e
r
D
o
c
umentation: bisect: "start"
accepts one bad a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Chri
s
tian Coud
e
r
Bisec
t
: teach "bisect s
t
a
r
t" to op
t
i
o
nally us
e
on
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
A
l
ex Rie
s
en
Fix pass
i
ng of TCLTK_PAT
H
to
g
it-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C
Hamano
Rename add_
f
il
e
_to_i
n
d
ex(
)
to add_fi
l
e_to_c
a
c
he()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Ren
a
me static variable write_
i
ndex to
update_i
n
dex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hama
n
o
Rename interna
l
function "add_fil
e
_
t
o
_cache" in built
i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Propagate cache err
o
r i
n
terna
l
to re
f
resh_
c
ache
(
) vi
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
i
o
C Hamano
Fix bogus error mes
s
age f
r
o
m merge-re
c
ursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
An
d
y Park
i
ns
S
h
ow binar
y
f
i
le
size change in
diff --s
t
at
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
P
earce
Ho
n
or
-
p<n> when applying git diffs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
F
i
x dep
e
nd
e
ncy
o
f common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next