repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix bogus linked-list management for user defined merge drivers.
2007-04-21
Junio C
H
am
a
no
Fix bogus link
e
d-li
s
t m
a
n
a
ge
m
ent for user defined
me
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Alex Rie
s
e
n
Si
m
plify calling o
f
CR
/
L
F
con
v
e
rsion
r
outin
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
Docu
m
ent gitattributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
amano
Up
d
ate 'c
r
lf'
attribute semantic
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o
C Haman
o
Documentation: s
u
pport ma
n
ua
l
sec
t
ion
(5) - file
f
ormats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Juni
o
C Hamano
Simplify code to find re
c
ursive merg
e
driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Counto-fix
i
n merge
-
recursiv
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
F
ix f
u
n
n
y types used in a
t
tribute value representation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Allo
w
lo
w
-level driver to specify different behavio
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Custom low-
l
ev
e
l
m
e
rg
e
driv
e
r: ch
a
nge the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o
C
Hamano
Allow
t
h
e de
f
ault lo
w
-
l
e
vel
me
r
g
e
driv
e
r
to
b
e configure
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Cus
t
om lo
w
-
lev
e
l
merge driv
e
r suppo
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
A
dd a demonstrat
i
on/test of cus
t
om
i
zed merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
Allow sp
e
cifying specia
l
ized merge-backend
p
er path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
m
a
no
me
r
ge-recursive: separate out xdl_merge() interf
a
ce
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
H
amano
Allow more than t
r
ue/false t
o
attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
James Bo
w
es
Document git-
c
hec
k
-at
t
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Cha
n
ge attrib
u
te negation 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 attribute macro "b
i
nar
y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribute macro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Make
f
ile: ad
d
patch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix
'd
i
ff
'
attribute
s
emantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
F
i
x 'crlf'
a
ttribut
e
seman
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
T
each '
d
iff' about 'diff' att
r
ibu
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define 'c
r
lf' a
t
tribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
A
dd b
a
sic infrastructur
e
to a
s
s
i
g
n
attribute
s
to
p
aths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
H
amano
M
e
rge bra
n
ch
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Linus Torvalds
git-quiltimport compl
a
ining y
e
t st
i
ll w
o
rking
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fr
a
nk Lichten
h
eld
c
onfig
.
t
x
t: Fix gra
m
matical error in
descri
p
t
i
o
n
o
f
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fran
k
Lich
t
e
n
hel
d
c
o
nf
i
g
.
txt: Change pserver
to server in description
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fran
k
Lic
h
tenheld
conf
i
g
.
tx
t
: Document core
.
autocrlf
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank L
i
chtenheld
c
o
nf
i
g
.
txt:
D
o
c
ument gitcvs
.
allbi
n
a
r
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Do n
o
t default to --no-inde
x
when given
t
wo directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Alex Riesen
Use rev
-
list --rev
e
rse in git-re
b
as
e
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hama
n
o
Merge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
a
ma
n
o
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-13
Ma
t
th
i
as L
e
derhofer
handle_
o
p
tions in git
w
r
apper mi
s
counts the
o
ptions
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Hamano
Fix git {log
,
show,
.
.
.
}
-
-p
r
etty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Shawn
O
.
P
e
arce
D
o
n
't yap abo
u
t merge-subtree during make
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Doc
u
mentat
i
on
:
--cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-l
o
g --cher
r
y-pick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Haman
o
Refactor p
a
tch
-
i
d
filterin
g
out of
git-c
h
erry
and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add
%m to '--pretty=fo
r
mat:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jim Me
y
eri
n
g
sscanf/strtoul:
p
ars
e
integer
s
rob
u
stly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
R
obin H
.
Johnson
Add
t
e
s
tcase for format-pat
c
h --s
u
bjec
t
-prefix (take 3)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Rob
i
n H
.
Johnson
A
d
d cust
o
m
s
ubjec
t
prefix support
t
o format-patch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
M
er
g
e bran
c
h
'
maint
'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ha
m
ano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
F
rank Lichtenhe
l
d
cvss
e
rver: Fix
han
d
l
i
n
g of diappeared files on update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsck: do
not com
p
lain on d
e
t
a
ched
H
EAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Jim Meyering
(
e
ncode_85
,
decode_8
5
): Mark so
u
r
c
e
b
u
f
fer pointer
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank
L
i
c
hten
h
el
d
g
i
tw
e
b
:
Allow con
f
igur
i
ng the default projects order
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
F
r
ank Lichten
h
eld
g
i
tweb: Allow
f
o
r
k
s w
i
th proje
c
t
l
ist file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io
C
Hamano
Merg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-10
Julian Phil
l
ip
s
Documentation: s
h
ow-ref:
document --exc
l
ude
-
existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
T
o
mash Brechko
cvsexpo
r
tcommit
-p : fix the usage of git-ap
p
ly -C
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
R
e
né Scharfe
g
i
t-arc
h
ive: make tar the default
f
o
r
mat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Me
r
ge br
a
nch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Ha
m
ano
Merge branch '
j
c/m
e
rge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merg
e
b
ranch 'js/fetch-pro
g
ress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Add
D
ocum
e
n
tation/cmd-list
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
E
ric Wo
n
g
git-svn
:
fix
l
og comma
n
d to
a
void
i
n
f
in
i
te loop o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn:
dcommit/rebase
c
onfuse
d
by patches with git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn:
bail out on incorr
e
ct
co
m
mand-line options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C
H
amano
Star
t
1
.
5
.
2 cycle by prepareing Re
l
Notes for i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
a
mano
M
erge branch 'jc/read-tree
-
df' (ea
r
ly part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
man
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prep
a
re for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Frank Lichtenhel
d
c
vsserver: small
c
orrection
s
to as
c
i
id
o
c
docume
n
tation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new merg
e
s
tragety
'
subtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push t
o
mu
l
tiple locations does
n
ot
stop at
t
he
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
am
a
no
git-push repo
r
t
s
the URL after
f
ailing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge
bra
n
ch 'jc
/
i
n
dex-outpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merg
e
br
a
nch '
f
p/make-j
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge branch
'
cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
m
an
o
Merg
e
b
r
anch 'jc/
c
heckout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
J
uni
o
C Hamano
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
ano
Docum
e
ntation: t
i
ght
e
n
dep
e
ndency for git
.
{html,tx
t
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arj
e
n
Laa
r
hoven
Mak
e
fi
l
e: ico
n
v() on Darwin has
t
h
e old interfac
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
t530
0
-pack-object
.
sh: portab
i
lity issue using
/usr
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C H
a
m
ano
g
i
t-bisect:
allow b
i
sec
t
ing w
i
th only one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
t6030: add a bit more tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arj
e
n Laar
h
oven
t3200-branc
h
.
sh: small language nit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
u
s
ermanual
.
txt
:
so
m
e
c
apitaliz
a
tion
n
i
ts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars
H
j
e
m
li
Mak
e
buil
t
i
n
-branch
.
c handle t
h
e
git config fi
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
rename_re
f
(): only print a warning when
c
o
nfig-file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Brian Gernhardt
Distinguish br
a
nches by m
o
r
e
than
cas
e
i
n tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIFUJI Hideaki
.
.
.
Avoid composin
g
too
l
ong "Refere
n
ce
s
" hea
d
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
F
ra
n
k Lichtenheld
cvsimport: Im
p
rove for
m
ating con
s
istenc
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank
Lichtenheld
cvs
i
mport: R
e
order options
i
n
d
o
c
umentation
f
o
r
bett
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimport:
I
mprove usage er
r
or
reporting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fra
n
k Lichtenh
e
l
d
cvsimport: Improve documentation o
f
CVSR
O
OT and CV
S
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fra
n
k L
i
chtenheld
cvsim
p
ort: sync usag
e
l
i
nes wit
h
exis
t
i
n
g
op
t
ion
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C
H
amano
git-
b
isec
t
: modernizat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C
H
amano
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2007-04-05
Dana How
Fix
lseek(2) ca
l
ls wi
t
h args 2 and 3 swapped
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
F
e
r
n
ando J
.
Pereda
M
a
k
e
fil
e
: Ad
d
'
+' to QUIET
_
SUBDIR0 to
fix paral
l
el
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ch
r
istian Co
u
d
e
r
D
ocument
a
t
i
on: bi
s
ect: "star
t
" acce
p
ts one
b
ad and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Christian Cou
d
er
Bis
e
ct: t
e
ach
"
bisect start" to optionally
use one
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next