repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Simplify code to find recursive merge driver.
2007-04-19
Junio C
Ham
a
n
o
Simplify code to find rec
u
r
s
i
v
e
merge dr
i
v
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Count
o
-fix
i
n merge-
r
ec
u
rsive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C
Hamano
Fix f
u
nny types used in attribute va
l
ue representatio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Haman
o
Allow low-level driver
to
spe
c
i
f
y di
f
ferent behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Custom low-level merge driver: change the co
n
figuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the def
a
u
lt low-level merge
dr
i
v
er to be
c
onfigur
e
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C H
a
man
o
Custom low-level merge
d
riv
e
r supp
o
rt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
d
d
a demonstration/test of customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
Allow s
p
ecifyi
n
g speciali
z
ed merge-backend
pe
r
p
ath
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
Hamano
merge
-
r
e
c
ursive: separ
a
te out xdl_
m
erge() in
t
erface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
Allow more th
a
n tr
u
e/false to
a
ttribu
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
n
o
Change
a
ttribute
n
e
gation marker fro
m
'!'
to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Define a built-in
a
t
tr
i
bute
m
acro "bin
a
ry"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
att
r
ib
u
te macro supp
o
rt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Ma
k
efi
l
e:
add
p
atch
-
ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Fi
x
'd
i
ff' attribute
s
ema
n
t
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
F
ix 'crlf' attribute semant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'di
f
f' about
'di
f
f'
a
ttri
b
ute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hama
n
o
D
efine 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hama
n
o
Add basi
c
infrastr
u
c
t
ure to assi
g
n att
r
ibutes to
paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C
H
a
m
ano
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do
n
ot d
e
fault to -
-
n
o
-index whe
n
giv
e
n two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch
'
jc
/
ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Haman
o
Fix git {log,show,
.
.
.
} --p
r
e
t
t
y=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C H
a
m
a
no
Documentation: --cherry
-
pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
git-log --cherr
y
-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
R
e
f
actor patch-id
filtering out
o
f
git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Add %m to '--pretty=f
o
rmat:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Mer
g
e branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C
H
amano
GI
T
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Juni
o
C Hamano
fsck: do not complain on
d
etac
h
ed H
E
AD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
branc
h
'
j
c
/
push'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
Merge
branch 'jc/merge-subtree
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'j
s
/f
e
tc
h
-pr
o
gres
s
'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C
Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C Hamano
A
dd Docu
m
entation
/
cmd-list
.
made
t
o
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
S
tart 1
.
5
.
2
c
ycle by prepareing
Re
l
N
o
te
s
for
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Mer
g
e branch 'jc/read-tree-df' (early
p
art)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Ha
m
ano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
P
repare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new
m
erge stragety 'subtre
e
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ha
m
a
no
git-pus
h
to multiple
l
ocations does not sto
p
at t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push
r
eports the
U
RL after fai
l
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
br
a
n
ch '
j
c/index
-
output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ham
a
no
M
e
rge branch 'f
p
/ma
k
e-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Merg
e
branch 'c
c
/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge bra
n
ch 'jc/
c
heckout
'
(early
part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C Hamano
Docum
e
ntati
o
n
: ti
g
ht
e
n d
e
p
end
e
n
cy for git
.
{html,
t
xt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
git-bisect: allow bisecting
w
ith
o
nl
y
one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ha
m
ano
t6
0
30: add a bit
m
ore test
s
t
o git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C
Hamano
g
it-bisect: modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Haman
o
Merge branch '
m
aint
'
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Rename add_file_to_ind
e
x
() t
o
add
_
file
_
t
o
_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hama
n
o
R
e
name static
v
ariable write_index to update_
i
n
d
ex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C H
a
man
o
Rena
m
e intern
a
l funct
i
on "add_
f
ile_to_
c
ache" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Pr
o
pagate cach
e
error interna
l
to re
f
resh_cac
h
e
() vi
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix bogus
e
rror message from merg
e
-recursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fi
x
dependency of common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
RPM spec:
in
c
l
ude
g
i
t-
p
4 in the
list of all packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Ha
m
ano
r
e
rere
:
make sorting reall
y
stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C H
a
mano
Fix swi
t
ching
t
o a b
r
anch with D/
F
wh
e
n
current b
r
anch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Ham
a
no
F
i
x twoway_merge that pa
s
sed d
/
f
conflic
t
marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix read-tree --prefix=dir
/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
un
p
ack-trees
:
get rid of
*
indpos parame
t
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
unpack_tree
s
.
c
: pass unpack_trees_opt
i
ons
structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add
_
cac
h
e_entry(): removal of file foo d
o
es not
c
o
n
flict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Merge bran
c
h 'jc
/
b
i
sect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
e
r
g
e
b
r
anch 'f
l
/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
M
erge branch 'post
1
.
5
.
1
/tcltk
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Merge branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hama
n
o
Mer
g
e branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
Ham
a
no
git-read
-
tree --index-output=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_GIT_I
N
DEX_OUTPUT: allow
p
l
umbing
t
o output to
a
n al
t
ern
a
tiv
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
a
n
o
checkout: allow detaching to HEA
D
even when switching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C H
a
mano
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
Merge 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Haman
o
GIT 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
rerere should
not re
p
e
at the earlier hunks i
n
later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio
C Hama
n
o
Hopefu
l
ly fin
a
l
u
p
d
a
t
e
t
o
t
he d
r
aft Releas
e
Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Jun
i
o
C Haman
o
Optional Tck/Tk
:
ignore gene
r
ated
f
iles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Haman
o
Do n
o
t bother documentin
g
fetch--too
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
U
pdate draft r
e
l
e
ase notes for
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io
C Ha
m
a
no
M
e
rg
e
bra
n
ch '
m
aster' o
f
g
it://rep
o
.
or
.
cz/git/
m
er
g
etoo
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
Documenta
t
ion: unbreak use
r
-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
J
unio
C Haman
o
Updat
e
main g
i
t
.
h
t
ml p
a
ge to
p
oint
at 1
.
5
.
0
.
6 doc
u
me
n
tation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Hamano
Me
r
g
e branch 'maint' to sync
h
ron
i
ze
w
it
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Haman
o
GI
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
aman
o
Fix "--pret
t
y=format:" f
o
r parent related items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-commit: "read-tree
-
m HEA
D
"
i
s
not
the right
w
ay
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
u
nio
C
Hamano
s
ha1_file
.
c (write_sha
1
_file): Detect close
f
ail
u
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Juni
o
C Hamano
Document
g
it-log --first
-
parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Merge
b
ranch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
J
un
i
o C
Hamano
Updat
e
R
EADME
t
o point at a fe
w
key periodical messages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next