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
merge-recursive: separate out xdl_merge() interface.
2007-04-17
Junio C
H
amano
mer
g
e-recursive: separat
e
o
ut xdl_merge() interfa
c
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Ha
m
ano
Allo
w
more t
h
an true/false to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Chang
e
attribut
e
negat
i
on marker f
r
om '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io C Ha
m
ano
D
e
fin
e
a built-i
n
attr
i
b
ute macro
"
b
ina
r
y"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
at
t
r
i
bute macro supp
o
rt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Makefile: add pa
t
ch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
Fix 'diff' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C
Hamano
Fix
'crl
f
' attribute s
e
ma
n
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
a
m
an
o
T
each 'di
f
f'
about '
d
iff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C H
a
mano
Define 'crlf' attrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
A
dd basic infrastru
c
tu
r
e to
assign attributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C H
a
mano
Mer
g
e
branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
Do n
o
t default to --no-index when g
i
ven tw
o
directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch 'jc/c
h
e
r
ry'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C
H
a
ma
n
o
M
e
rge
b
ran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Ha
m
an
o
Fix git
{
l
o
g
,s
h
o
w
,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
uni
o
C
Hamano
D
ocume
n
tat
i
on: --
c
her
r
y
-
p
i
c
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C H
a
m
a
no
g
it-log --cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Ref
a
ctor pat
c
h-i
d
fi
l
t
e
ri
n
g out
o
f git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
A
dd %
m
t
o
'--
p
r
e
t
ty=format:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
unio C Hamano
fsck: d
o
not co
m
plain on
d
e
tached HE
A
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
m
a
no
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Mer
g
e br
a
nch 'jc/pu
s
h'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C
H
amano
Mer
g
e b
r
anc
h
'j
c
/merge-su
b
tre
e
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C H
a
m
a
n
o
Merg
e
branch
'
js/fetch-p
r
og
r
ess'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge bra
n
ch
'
main
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
Add Documentat
i
on/cmd-li
s
t
.
m
ade
t
o
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Haman
o
Start 1
.
5
.
2 cycle by preparei
n
g RelNo
t
es for
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Ha
m
ano
Mer
g
e bran
c
h 'jc/read
-
tre
e
-d
f
' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hama
n
o
Merge
bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Prepare
f
or 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 s
t
ragety 'subtre
e
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
git-push to
multiple
l
ocatio
n
s does not stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push repo
r
ts the
URL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge
b
ranc
h
'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Mer
g
e bra
n
ch
'
fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Merge bran
c
h 'cc/
b
i
s
e
c
t'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merge bran
c
h 'jc/checkout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
H
am
a
no
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Do
c
umentation: ti
g
hte
n
de
p
enden
c
y
for g
i
t
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Ha
m
ano
git
-
bisect: all
o
w bise
c
ti
n
g with only one bad
c
o
m
mit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
t60
3
0: add
a
b
i
t mor
e
tests
to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Ju
n
io
C Haman
o
git-bi
s
ect: moderniz
a
t
i
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
R
e
nam
e
add_file_to_i
n
dex() t
o
a
dd_f
i
le_t
o
_
c
ach
e
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename static variabl
e
write_in
d
ex to update
_
index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Rena
m
e internal fun
c
t
ion
"
add_file
_
t
o_cache" in
buil
t
in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Propagate cache erro
r
inter
n
al to refres
h
_c
a
che() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Haman
o
Fix bogus error message from merge-recursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Fix dependency of common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Hamano
RPM spe
c
:
include gi
t
-
p
4 in the list
of all pac
k
a
g
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere:
m
ake sorting
really sta
b
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Fix switc
h
ing to
a b
r
anch with
D/F when current
bran
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
F
ix twowa
y
_merge that passed d/f con
f
lict mar
k
er to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
ama
n
o
Fix
r
e
a
d
-
tree
--prefix=di
r
/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack-t
r
ees: g
e
t rid o
f
*ind
p
os parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
amano
unpack_trees
.
c: pass unpack_trees_optio
n
s structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
Hamano
a
d
d
_cache_entr
y
(): removal
o
f file f
o
o
do
e
s not con
f
lict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
er
g
e
bra
n
ch 'jc/
b
isect'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
Hamano
Merge
b
ranch 'f
l
/doc'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Ham
a
n
o
Merge b
r
anc
h
'post1
.
5
.
1
/
blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
M
erg
e
branch 'pos
t
1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Mer
g
e bra
n
ch 'post1
.
5
.
1
/p
4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
M
e
rge b
r
anch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
Hamano
git-read-tree
--inde
x
-out
p
ut=<fil
e
>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Haman
o
_GI
T
_INDEX_OU
T
P
UT: allow
p
lumb
i
n
g
t
o outpu
t
to an alternati
v
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hama
n
o
checkout: allow detaching to HEAD e
v
en w
h
en switch
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hama
n
o
GIT
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
Hamano
M
erge 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Haman
o
GIT
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Ha
m
ano
rere
r
e should not repea
t
the earlier hunks in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefully fina
l
update to the draft Rele
a
se Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Juni
o
C Hamano
Optional Tck/Tk:
ignor
e
generat
e
d files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Hamano
Do not bothe
r
documenting fe
t
c
h
--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Up
d
ate draft r
e
leas
e
notes f
o
r 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Ha
m
a
n
o
Me
r
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
ama
n
o
Merge
b
r
anc
h
'ma
s
ter' o
f
git://repo
.
o
r
.
cz/git/mer
g
e
t
ool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
mano
Docume
n
ta
t
ion: unbreak us
e
r
-
manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT 1
.
5
.
1-r
c
3
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
Update main git
.
html pag
e
to point at 1
.
5
.
0
.
6 documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Ham
a
no
M
e
r
ge br
a
nch 'maint' to s
y
nch
r
onize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
G
I
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio
C H
a
mano
F
i
x "
-
-
p
retty=for
m
a
t
:" fo
r
parent rel
a
ted it
e
m
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
H
amano
gi
t
-commit: "read-tree -m HEAD" is not the right
way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C Ham
a
no
sha1
_
file
.
c (write_sha1_file): Detect
c
l
o
se failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io C Hama
n
o
Docume
n
t
g
it-log --
f
i
r
st-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
J
u
nio C Hamano
Merge b
r
anch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Update
R
EADM
E
t
o point at a f
e
w key periodical messages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Haman
o
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch
'
m
a
int'
of git:/
/
l
i
nux-nf
s
.
or
g
/~bfield
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Haman
o
Merge
b
ranch 'js/rem
o
te-sh
o
w-pus
h
'
commit
|
commitdiff
|
tree
2007-03-25
Juni
o
C
Ham
a
no
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
git-am documentation
:
describe
what
is t
a
k
en from where
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
m
ake the p
r
e
v
ious optimi
z
ati
o
n work
also on pat
h
-l
i
mited
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
J
unio C Hamano
rev-list --bisect: Fix "hal
f
wa
y
"
optimization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
Merge bran
c
h
'master' into jc/bisect
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ham
a
no
M
e
rge bra
n
c
h
'main
t
'
commit
|
commitdiff
|
tree
next