repo.or.cz
/
git
/
fastimport.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 support.
2007-04-18
Junio C H
a
m
ano
Custom low-le
v
el merge
d
river support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C H
a
m
ano
Add a demo
n
s
t
ration/t
e
st of cu
s
to
m
ized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
Allow
s
pecif
y
ing specialized merge-
b
ackend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
me
r
ge-
r
ecursive: separate ou
t
xdl_m
e
r
g
e() int
e
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
Allow
m
o
re
t
h
a
n true/false t
o
attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Ch
a
n
g
e attr
i
bute negation mar
k
er fro
m
'
!
'
to '
-
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Define
a built-in
attribute macro
"binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribut
e
m
a
c
ro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile: add pat
c
h-id
s
.
h
back
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
ama
n
o
Fix 'diff' attribute se
m
a
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io
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
T
each 'diff' about 'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
D
e
fine 'crlf'
attribut
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add basic infrastructur
e
to a
s
sign a
t
tributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Do n
o
t default to
--no-in
d
ex when given
t
wo di
r
ectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Mer
g
e branch 'jc
/
cherry'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
F
ix
git {log,
s
how,
.
.
.
} --pret
t
y=emai
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
m
a
no
Documenta
t
io
n
: --c
h
erry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
amano
git-log
--cher
r
y-pick
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
Ref
a
c
to
r
pa
t
ch-id fil
t
er
i
ng out of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C
Hamano
A
d
d
%m
t
o '--pretty=f
o
rmat
:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
M
e
rg
e
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
G
I
T 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
f
s
ck: do not complain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C
Hamano
Me
r
ge
bran
c
h
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
Merge
b
ranch 'jc/
m
er
g
e-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
aman
o
Merge branc
h
'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Mer
g
e branch
'main
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add
Documen
t
ation/cmd
-
list
.
made to
.
giti
g
nore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Start 1
.
5
.
2 cycle
b
y prepareing RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
Merge
b
r
a
n
c
h
'jc/read-tree
-
df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prepar
e
fo
r
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C H
a
mano
A n
e
w merge stragety
'subtr
e
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
H
amano
git-
p
us
h
to
multiple locati
o
ns does no
t
stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
it-pus
h
report
s
the URL after f
a
ilin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Merge branch
'jc/i
n
de
x
-output'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
M
e
rge
br
a
nch 'fp/make-j
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
branch
'cc/
b
isect'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
M
erge branc
h
'jc/
c
he
c
kout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge bra
n
ch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Docu
m
e
n
ta
t
io
n
:
t
ighten dependency for git
.
{html,
t
xt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
git-b
i
sect: allow b
i
secting
with
o
n
l
y
one bad com
m
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
t6030
:
add a
b
i
t
mo
r
e
t
e
st
s
to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hama
n
o
gi
t
-bis
e
ct: modernizatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
Mer
g
e bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C
H
a
mano
Renam
e
add_file
_
t
o
_
index() t
o
a
dd_file_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io 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
Junio C Hamano
Rename internal func
t
ion "add_file_to_cache" in b
u
iltin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
io
C Hamano
Propagate cache err
o
r in
t
er
n
al to re
f
resh_cac
h
e() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Fix bogus
e
r
r
or messag
e
from merge-r
e
cursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix depe
n
denc
y
of common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
RPM spec: include git-p4 i
n
the li
s
t of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerer
e
: m
a
ke sortin
g
really sta
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C H
a
mano
Fi
x
swit
c
h
ing to a b
r
an
c
h with D/F when current branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
F
i
x
t
woway
_
me
r
ge tha
t
p
assed d/f conflict ma
r
ker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix read-tree --prefi
x
=di
r
/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Haman
o
unpack-trees: get r
i
d of *indpos
parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C H
a
mano
un
p
ack
_
trees
.
c: pass u
n
pa
c
k_trees_option
s
st
r
ucture
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_cache_e
n
tr
y
(): removal of file foo does not conflic
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C H
a
m
a
no
Merge
b
r
a
nch 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Ham
a
no
Merge
branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge bra
n
ch 'pos
t
1
.
5
.
1/blame
.
e
l
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
ano
Merge branch
'post1
.
5
.
1/t
c
l
t
k'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Mer
g
e branch 'p
o
st1
.
5
.
1
/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
M
e
rge b
r
anch 'l
t
/
dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
git-read-tree --i
n
de
x
-output=<fi
l
e>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
_GIT_IN
D
EX_OUTPUT:
a
llow pl
u
m
bing
to output to an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
checkout: allow detachin
g
to
H
EAD even when switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
Hamano
Merge
1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hama
n
o
r
e
r
er
e
should
not repeat th
e
ea
r
lier hun
k
s in
l
ater
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C
H
amano
Hopefully final update to th
e
draft Relea
s
e Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
J
unio C Hamano
Op
t
ional
Tck/Tk: ignore generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do not bother documenting fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Update
d
raft rele
a
se notes f
o
r 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
M
erge branch 'mas
t
er' of git://r
e
po
.
or
.
cz/
g
it/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o
C Hamano
D
o
cumentation: unb
r
eak u
s
er-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C
H
ama
n
o
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Upda
t
e main git
.
html
page
to point at 1
.
5
.
0
.
6
do
c
umentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
Merg
e
branch 'maint' to sync
h
r
onize wit
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
G
IT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C H
a
mano
Fix "--pretty=format:" for parent
related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
gi
t
-commit: "r
e
ad-tree -m HEA
D
" is not the right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
unio C Hamano
sha1
_
f
i
le
.
c (write_sha1_file): De
t
ect close failu
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
u
nio C Hamano
Doc
u
m
e
nt git-log --f
i
rst-
p
arent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C H
a
mano
GIT 1
.
5
.
1
-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Me
r
g
e
bran
c
h
'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Up
d
a
te README
to po
i
nt a
t
a few k
e
y periodical
m
essages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ha
m
an
o
M
erge branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C
Ha
m
ano
Merge
b
ranch '
m
aint' of git://linux-nfs
.
org/~b
f
ields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C
H
amano
Merge b
r
anch 'j
s
/rem
o
te-show-push'
commit
|
commitdiff
|
tree
2007-03-25
J
unio C Hamano
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2007-03-24
Junio C
Hamano
git-am documentation:
d
escribe what is tak
e
n fro
m
wh
e
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ham
a
no
make the prev
i
ous optimization work als
o
on path-limit
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next