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
make "repack -f" imply "pack-objects --no-reuse-object"
2007-04-18
J
un
i
o
C
Hama
n
o
Allow low-
l
eve
l
driver t
o
specify di
f
ferent beh
a
viour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ha
m
ano
Custom low-level
m
e
rge dr
i
ver: chan
g
e the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
A
l
l
ow th
e
default
low-
l
eve
l
merge dri
v
er to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
ma
n
o
Custom low-level m
e
rge driver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C
H
amano
Merge branch 'fl/cvsserv
e
r'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Update draft release note
s
fo
r
1
.
5
.
2
with accu
m
ulat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
M
erge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C H
a
mano
Start prepar
i
ng for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
Merge branch 'ma
s
t
e
r
'
of git://repo
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
Hamano
Merge bra
n
ch 'maint' of
g
i
t
:
/
/repo
.
or
.
cz/g
i
t-gui
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
Me
r
g
e branc
h
'
jc/r
e
ad-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Add a
demons
t
ratio
n
/tes
t
of cust
o
mized me
r
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
man
o
All
o
w spe
c
i
f
yin
g
specialize
d
merge-b
a
ckend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C
H
amano
g
it-gui: Honor
TC
L
TK_PATH
i
f supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
me
r
ge-recursive: separate
o
u
t xdl_me
r
g
e() inte
r
fac
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o
C Hamano
Al
l
ow m
o
re than true/false to
a
tt
r
ibutes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
Make
s
ure quickfetch is not fooled with a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
erge branch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
J
u
n
io C
Hamano
send-em
a
il: do not
leav
e
an
e
mpty CC: line if n
o
cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C H
a
mano
Me
r
ge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Change a
t
tribute negation mark
e
r from
'!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
Defi
n
e a built-in
a
tt
r
ibute macr
o
"binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
un
i
o C Haman
o
attribute
m
ac
r
o
s
upport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ham
a
no
Makefi
l
e:
add
patch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff' attri
b
ute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Fix 'crlf' att
r
ibute se
m
an
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merge g
i
t
://gi
t
2
.
kerne
l
.
org
/
pub/scm/gi
t
k/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
T
ea
c
h
'
d
i
ff' about 'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Defi
n
e 'crlf'
a
ttribu
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
Add b
a
sic
inf
r
astru
c
tu
r
e to assi
g
n at
t
r
i
b
u
t
e
s t
o
paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io
C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Ha
m
ano
R
eplace a pair of patches with updated one
s
for
s
ubp
r
o
j
ect
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
ni
o
C Haman
o
D
o
no
t
d
ef
a
ult to --no-in
d
ex wh
e
n given
t
wo
d
ir
e
cto
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge
b
ranch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
n
i
o
C Ham
a
n
o
Fix gi
t
{lo
g
,show,
.
.
.
}
--pr
e
tty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Docu
m
entation:
--cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Hama
n
o
git-log
--cherry
-
pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
Refact
o
r patch
-
id filtering out
of git-cherry and g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Ad
d
%m to '--
p
retty=fo
r
m
a
t
:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Haman
o
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
G
IT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C
Ham
a
no
fsck: do not comp
l
a
i
n on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
git-f
e
tch: use
fetch--tool pick-
r
ref to avoid
local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Hamano
gi
t
-fetch--t
o
ol pick-rr
e
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
t
3
030: merge-re
c
ursive backend
t
est
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C
Hamano
m
e
rge-recursive: handle D/F conf
l
ict c
a
s
e
m
ore carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-rec
u
rsive:
d
o not
barf
on "to be
re
m
oved" entri
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C H
a
m
ano
Treat D/F conflict entry more ca
r
efully in unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Haman
o
t1000: fi
x
case tab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C
Hamano
sho
r
t
log -w:
m
ake wrap-l
i
ne behavi
o
ur
optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Me
r
ge branc
h
'jc/pu
s
h
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch
'jc/merge-
s
ubtr
e
e
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merge bra
n
c
h 'js/fetc
h
-progr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
ama
n
o
Merge b
r
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
i
o C H
a
mano
Add Documentat
i
on/cmd-li
s
t
.
m
a
de to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 cycle by prepareing R
e
l
N
otes fo
r
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio
C Hamano
M
e
rge branch '
j
c/read-tree-df' (early part
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Mer
g
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Prepare
fo
r
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
A
new merge st
r
a
g
e
t
y 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-pu
s
h to
m
ultiple locations do
e
s not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C Haman
o
git-push reports the URL after fai
l
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
b
r
a
nch 'jc/ind
e
x-
o
utput
'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
man
o
Merge
b
ranch 'fp/
m
ake-j'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C
H
a
mano
Merge branch 'cc/
b
i
s
ect'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hama
n
o
Merge bra
n
ch '
j
c/checkout' (ear
l
y pa
r
t)
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Ha
m
ano
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C Hamano
Docu
m
entat
i
on:
tight
e
n d
e
pe
n
dency f
o
r git
.
{html,txt
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
git-bisec
t
: allow bisectin
g
with only
one bad com
m
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030: add
a
b
it more tes
t
s to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
g
i
t
-
bisect:
moderni
z
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Ham
a
no
Rename add
_
file_to_index() to ad
d
_fi
l
e_to_ca
c
he()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Re
n
a
m
e
static var
i
able write_index to update_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename in
t
ernal
functi
o
n
"
add
_
file_to_cache" in buil
t
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
P
ropagate cache error internal
to refr
e
sh_cache()
v
ia
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Fix bogus
error me
s
sage from merge-recur
s
iv
e
e
r
ror
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hama
n
o
Fix dependency
o
f common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
R
PM spec: i
n
clude git-p4 in the
l
i
st of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
r
e
r
e
r
e
: make
s
ort
i
ng
r
eall
y
st
a
ble
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
Haman
o
Fix switch
i
n
g t
o
a
branch w
i
th D/F whe
n
current
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
F
i
x twoway_merge that pa
s
sed d/f
c
onflict marker
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Fix read-tree --prefix=
d
ir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack-
t
rees: get rid of *in
d
pos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
u
n
p
ac
k
_
trees
.
c:
p
as
s
unpac
k
_trees_options st
r
uctu
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
a
dd_cache_entry(): removal
of
fil
e
f
oo do
e
s
n
ot conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Hamano
M
e
r
g
e
br
a
nch 'jc/b
i
sect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Me
r
ge
branch 'fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Merge br
a
nch 'po
s
t
1
.
5
.
1/blame
.
e
l
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
b
ra
n
ch 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merg
e
branch 'post1
.
5
.
1
/
p
4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Merge
b
ranch 'lt
/
dirwa
l
k
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-
r
ea
d
-tree --index
-
output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_GIT_INDEX_OU
T
PUT: a
l
low plumbing to outpu
t
t
o
an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
ma
n
o
checkout:
a
llow
d
etaching to HEA
D
eve
n
whe
n
switchi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
H
amano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next