repo.or.cz
/
git
/
dscho.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
Junio C Hamano
Counto-
f
ix in merge-re
c
u
r
sive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Fix
funny types used
i
n a
t
t
ribu
t
e value re
p
resentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Haman
o
All
o
w low-level driver to specify
d
iff
e
rent behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C
Hamano
Custom low
-
leve
l
merge dr
i
ver: change the configu
r
ation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
All
o
w the
def
a
ult low-le
v
el me
r
ge driver t
o
be
configur
e
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hama
n
o
Custom low-level merge driver supp
o
rt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a demonst
r
ation/test o
f
c
u
s
t
omized
merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allo
w
speci
f
ying specialized merge-backend per
path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recursive: separate out
x
dl_me
r
g
e() interfac
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Allow more than
t
rue
/
false to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
James Bowes
Document git-c
h
eck-attr
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Change attribute negatio
n
m
a
rker from '!
'
to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Ham
a
n
o
Define a built-in
a
t
tribute macro "bina
r
y"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
a
t
t
r
ibu
t
e
macro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Makefile: add patch-ids
.
h
b
ack
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
F
i
x '
d
iff' attribute sema
n
tics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Teach 'diff' ab
o
u
t
'dif
f
'
a
t
tribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
un
i
o C
H
amano
Define
'
c
rlf
'
attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Add b
a
s
i
c
infrastructure to assign attribu
t
es
to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Lin
u
s Torvalds
git-q
u
iltimpor
t
co
m
plaining yet stil
l
working
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lich
t
en
h
e
l
d
config
.
txt
:
Fi
x
g
rammatica
l
er
r
or in desc
r
iption
of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fr
a
n
k
Lichtenheld
confi
g
.
txt: Change ps
e
rver to server in description
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenheld
config
.
txt: Docum
e
nt core
.
autocrlf
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Li
c
htenhel
d
config
.
txt: Doc
u
ment gitcvs
.
allbinary
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio
C Hamano
Do n
o
t
d
e
fault to --
n
o
-
index when given two
d
ire
c
tories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
A
lex Riese
n
Use rev-list --reverse in git-rebase
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
no
Merge branch
'
jc/
c
herry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-13
Matth
i
as
Lederhofer
hand
l
e_options in git w
r
appe
r
miscounts
the
option
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix g
i
t {log,show,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Shawn O
.
P
earce
Don't yap about merge-
s
ubtree during m
a
ke
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Ham
a
no
Doc
u
men
t
ation: --cherr
y
-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Ham
a
no
git-log
-
-ch
e
rry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
ni
o
C Hamano
Refactor patch-id fil
t
ering out of git-cher
r
y and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Add %m to '--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
i
m Meyeri
n
g
sscanf
/
strtoul: parse integ
e
rs robustly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin
H
.
Johnson
Add
t
e
s
tcase for
format-patch
-
-subject-prefix (take 3)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
R
obin H
.
Johns
o
n
Ad
d
c
ustom subject pre
f
ix support
t
o
format
-
p
atch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lic
h
tenheld
cvs
s
erver: Fix handling
o
f
d
iap
p
eared files on update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hama
n
o
fsck: d
o
not
c
om
p
la
i
n on deta
c
hed HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Jim Meyering
(e
n
cod
e
_85, d
e
c
ode_85)
:
Mar
k
source
b
uffer pointer
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Li
c
htenheld
gitweb
:
A
l
l
o
w conf
i
guring the
d
e
f
ault p
r
ojects order
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank
Lichtenheld
gitweb: Allow forks with project list file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Me
r
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-10
Julia
n
P
h
ill
i
ps
Documentation: show-ref: document
-
-
exclude-existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Tomas
h
Bre
c
hk
o
cvsexportcommit -p :
fix
the
usage of git
-
apply -C
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
René Scha
r
fe
git-archive: make tar the default forma
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C
H
amano
Merge branch '
j
c/push'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
M
erge branch 'jc/merge-s
u
btree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
M
e
rge branch 'js/f
e
t
c
h-pr
o
gress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
A
d
d Documentation/cmd-list
.
m
a
de
to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn: fix log command
t
o
avoid infin
i
te loop on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Er
i
c Wong
git-svn: d
c
ommit/rebase confused by patches
w
i
th git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
E
r
ic W
o
ng
git-svn: bail o
u
t
o
n incorrect comman
d
-line options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
unio
C
Hamano
Start 1
.
5
.
2 cycle by pre
p
areing
R
e
lNotes fo
r
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Merge branch '
j
c/read-tre
e
-
df' (e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
ma
n
o
Merge branch
'
main
t
'
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
Fr
a
nk Li
c
htenheld
cvsserver: s
m
all corre
c
t
i
ons to asciidoc documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
A new m
e
rg
e
strage
t
y
'sub
t
ree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
git-push to mult
i
ple
l
ocation
s
doe
s
no
t
sto
p
at th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
git-push reports the
U
RL
a
fter faili
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
ni
o
C
Hamano
Merge branc
h
'j
c
/index-ou
t
put'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Haman
o
M
e
r
ge branch
'fp
/
ma
k
e
-
j'
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
Ha
m
ano
Merge b
r
anch 'cc
/
bisec
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Haman
o
Merge
b
ra
n
ch 'jc/checkout' (ea
r
ly part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Documentatio
n
: tighten depe
n
dency for git
.
{html,
t
x
t
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
A
rj
e
n Laarhoven
M
akefi
l
e: ic
o
nv()
o
n Darwin has
t
he old
i
nt
e
r
f
ace
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarh
o
v
e
n
t5300
-
p
a
ck-ob
j
e
c
t
.
sh: port
a
b
i
lity issue u
s
ing
/us
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hama
n
o
git-bisect: allow bisecting with only one bad
commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o 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 Laarhoven
t3200-bra
n
ch
.
sh: small l
a
ngua
g
e
nit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhov
e
n
usermanual
.
txt
:
some capitaliz
a
tio
n
nits
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lar
s
Hj
e
mli
Mak
e
bu
i
ltin-b
r
anch
.
c
ha
n
dle the
g
it config fil
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
re
n
a
m
e_ref():
o
nly print a warn
i
n
g
w
h
en conf
i
g
-f
i
le
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Br
i
an Ger
n
hardt
Distin
g
u
ish b
r
anches by
more than c
a
se
in test
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Y
OSHI
F
UJI Hideaki
.
.
.
Avoid
composing too long "Referen
c
es" he
a
de
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Li
c
htenheld
cv
s
impo
r
t: Improve formati
n
g
consistency
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fr
a
nk Lich
t
enheld
cvsimport: Reorder option
s
i
n
document
a
tion for bette
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Licht
e
nheld
cvsimport: Improv
e
usage error reportin
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
F
r
a
nk
Li
c
hte
n
held
cv
s
i
mport: Improve documentation of CVSRO
O
T and C
V
S
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimport
:
sy
n
c
usa
g
e l
i
nes with existing options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
J
uni
o
C Hamano
g
i
t-bisect:
moderniza
t
i
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
uni
o
C Hamano
Merge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Dana Ho
w
Fix lseek(2) calls with arg
s
2 an
d
3
s
wappe
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Fernando
J
.
Pereda
Makefile: Add '+' to QU
I
ET_SUB
D
IR0 to fix parallel
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Christian Coude
r
Documentation: bis
e
ct:
"
start"
accepts on
e
b
a
d
and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Chris
t
i
a
n
Couder
Bise
c
t: tea
c
h "bisect star
t
"
t
o opt
i
onally use
one
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Alex Riese
n
Fix passing of TCLTK
_
PATH to git-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio
C
Ha
m
ano
Rename ad
d
_fil
e
_to_in
d
ex
(
) t
o
add_
f
i
l
e_to_cach
e
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Rename static variable write_index to update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C H
a
mano
Rename inter
n
al function "add_file_t
o
_
cache" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C
Hamano
Propagate cache
erro
r
internal
t
o ref
r
esh_cache(
)
via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix bogus e
r
ror mes
s
age
fr
o
m mer
g
e-recursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next