repo.or.cz
/
tgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
GIT v1.5.2-rc3
2007-04-18
Junio C Hamano
A
llow l
o
w-level driver to
s
p
ecify different behaviou
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Cu
s
tom lo
w
-level mer
g
e
driver
:
change t
h
e co
n
figuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hama
n
o
Allow the
d
efaul
t
l
ow-level mer
g
e driver
to be conf
i
gur
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Custom low-level merge driver suppor
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ha
m
ano
Merge bra
n
ch 'fl
/
cvsserv
e
r'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update draft relea
s
e notes for 1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C H
a
mano
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Ha
m
a
n
o
Start prepar
i
ng for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
Merge branch 'master' of git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Merge branch 'maint' o
f
g
i
t
://repo
.
or
.
cz/git-gui
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ha
m
an
o
M
e
rge bran
c
h 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Haman
o
Add
a
d
emonst
r
ation/tes
t
of customiz
e
d me
r
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
Ha
m
ano
Allow specifying specialized m
e
rge-backend per pat
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o
C
Haman
o
git-gui: Honor TCLTK_
P
ATH
i
f s
u
pplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io
C
H
a
ma
n
o
merge-recurs
i
ve: separate
out xdl_merge() inte
r
f
a
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
io C Hamano
Allo
w
mo
r
e than tru
e
/false to attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Make sur
e
quick
f
etch
i
s not fooled with a pre
v
io
u
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C
H
a
m
a
n
o
Merge
branch 'js/wrap-lo
g
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
send-email: do not le
a
ve an empty CC: line i
f
no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
n
io C Ha
m
ano
Mer
g
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Hama
n
o
Mer
g
e b
r
a
n
ch 'maint
'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Change attr
i
bute negation marke
r
from
'
!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C H
a
mano
D
e
fine a
built-in attribute macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
at
t
ribute macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Ham
a
no
Makefile: add
p
atch-id
s
.
h
b
ack in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
H
amano
Fix
'
di
f
f' a
t
tribute
s
emantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Fix '
c
r
l
f' a
t
tribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Me
r
ge g
i
t://
g
it2
.
kern
e
l
.
org/p
u
b/scm/gitk/g
i
tk
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach
'
d
iff' about 'diff' attri
b
ute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Define 'cr
l
f' a
t
tribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
io
C
H
a
m
a
no
Add basic
i
nfrastructur
e
to as
s
ign attributes to pa
t
hs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
Merge b
r
an
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Ham
a
no
Replace a
pair of patches
with updated ones for subp
r
oject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
a
mano
Do n
o
t
defaul
t
t
o -
-
no
-
in
d
ex when gi
v
en
t
w
o directo
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio
C
Hamano
Merge branch
'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Hamano
Fix git {log,show,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C
Ha
m
a
n
o
Documentation: --
c
her
r
y
-
pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio 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
n
io C Hamano
Refactor
patch-id filterin
g
o
ut of
g
it-cher
r
y and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
ni
o
C Ha
m
ano
Add %m to
'--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hama
n
o
Merge 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
Junio C
H
amano
f
s
ck: do
not co
m
p
l
ain on detache
d
HE
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Ha
m
ano
Merge
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C
Ha
m
a
no
git-fetch: use fe
t
ch--tool pick-rref to avoid
l
ocal
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
ni
o
C
Hamano
git-fetch--
t
ool p
i
ck-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
t
3030: merge-re
c
ursi
v
e b
a
ckend
test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
merge-
r
ecurs
i
ve:
handl
e
D/
F
conf
l
ic
t
c
ase more carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
m
e
rge
-
r
ec
u
rsiv
e
:
do not
b
arf o
n
"to be
remov
e
d" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
T
reat D/F conflict
entry mor
e
c
a
refully in u
n
pa
c
k
-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t
1
000: fix ca
s
e
t
a
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
s
hortlog
-w: ma
k
e
wrap-line behavi
o
ur optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
n
o
M
erg
e
bra
n
c
h 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Me
r
ge branch 'jc/merge-
s
ubtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Merge branch 'js/fetch-p
r
ogress'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
Merge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Ha
m
ano
Add Do
c
u
m
entation/cmd
-
list
.
made t
o
.
gitign
o
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 cycle by prepa
r
e
ing RelN
o
tes
for
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge b
r
a
nch
'
jc
/
read-tree-df' (ear
l
y part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Ha
m
ano
Prepare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
mano
A new merge stragety 'sub
t
ree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
git-push t
o
multip
l
e locat
i
ons
does not stop a
t
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
ma
n
o
gi
t
-pu
s
h repo
r
ts the UR
L
aft
e
r
failin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Merge branch 'jc/index-ou
t
put'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C
Haman
o
Me
r
ge
branch 'f
p
/ma
k
e-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Haman
o
Me
r
ge branch '
c
c/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
Merge branch '
j
c/
c
heckout' (early
part
)
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C
Hamano
Merge branch
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Documentation: tighten dep
e
n
denc
y
for
g
i
t
.
{htm
l
,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
git
-
bisect: allow bisectin
g
with onl
y
one b
a
d commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o
C H
a
mano
t6030
:
a
dd a bit more tests to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bis
e
ct: moder
n
i
z
ati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Ren
a
me
a
dd_f
i
le_to_index() to a
d
d_file_to_ca
c
he()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C Hamano
Rename stati
c
v
ariable wri
t
e
_
in
d
ex to update_in
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
Rename internal function "add_file
_
t
o
_cache" in
bui
l
t
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
P
ropag
a
te cache error
i
n
t
e
r
n
a
l to refre
s
h_cache()
v
ia
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fi
x
bogus
e
rro
r
me
s
sage
f
ro
m
m
e
rge-recursive
error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Fix depe
n
d
enc
y
of com
m
on-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec:
include
g
i
t-p4 i
n
the l
i
st of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
rer
e
re:
make sorting really stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix
s
witching to a branch
w
i
t
h D/
F
when
c
urrent bra
n
ch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix twoway_m
e
r
g
e
that
p
a
ssed
d
/f conflic
t
marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
aman
o
Fix rea
d
-t
r
ee --
p
refix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Ha
m
ano
unpack
-
tree
s
: get rid of *indpos param
e
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
unpack_trees
.
c
: pass u
n
pack_trees_options structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
Hamano
add_cache_entr
y
(): removal of file foo doe
s
not c
o
nflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
Haman
o
Merge
b
r
anch 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
Hamano
Merge bra
n
ch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Haman
o
Merge branch 'post1
.
5
.
1/blame
.
e
l
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ha
m
ano
Merge bran
c
h
'
post1
.
5
.
1
/
tcl
t
k
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Ha
m
ano
Merge branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
Hama
n
o
M
erge branch 'lt
/
dirwa
l
k'
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C Hamano
gi
t
-read-tree -
-
ind
e
x
-
output=<f
i
le>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_GIT_INDEX_OU
T
PU
T
: al
l
o
w
plumb
i
ng to output to an alterna
t
iv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
checko
u
t
: allow
d
etaching
t
o
HEAD even when
s
witching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
G
IT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next