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
Juni
o
C
H
aman
o
m
e
r
ge-recursive: separate o
u
t xdl_merge(
)
interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
Allow more than true/false
t
o att
r
ibutes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C Hamano
Change attrib
u
te
negation
m
arke
r
f
rom
'!' t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Haman
o
Define a built-in attribute macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
attribute
m
a
cro sup
p
o
rt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile: add patch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C
Hama
n
o
Fix 'diff' a
t
t
ribu
t
e
semantic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Fix
'
crlf' at
t
ribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Teac
h
'diff
'
about
'
diff'
a
ttri
b
ute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio 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 Haman
o
A
dd basic infrastr
u
cture to assign attributes to pat
h
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Do n
o
t
defau
l
t to --no-index w
h
en given
t
wo directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io
C
Hamano
Merge
branch
'
jc/cher
r
y'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-13
J
u
n
i
o
C Hamano
Fix git {
l
og,show,
.
.
.
} --pret
t
y=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
D
ocumentation: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
git-log --cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Refactor patch-id filtering
out of git-che
r
r
y and gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
A
dd %m to '--pret
t
y=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
aman
o
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
sck: do n
o
t complain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Mer
g
e bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Haman
o
M
er
g
e
b
r
a
nch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Merge b
r
anch
'jc/merge-subtree
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
Me
r
ge branch
'
js/fe
t
ch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Documentati
o
n/c
m
d-list
.
made 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 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 branch 'jc
/
read-tree-df
'
(e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-08
J
unio C
H
amano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Prepare fo
r
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Hamano
A new merge stragety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
g
it-
p
ush
to m
u
lt
i
ple loc
a
tions does
n
ot stop
at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
git-push reports the URL after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
M
erge branch 'jc/ind
e
x-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Mer
g
e
branch 'fp/make
-
j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge br
a
nc
h
'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
Ha
m
ano
Merge br
a
n
ch 'jc/checkout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
mano
Merge
bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
Documentati
o
n
:
tight
e
n dependency for g
i
t
.
{ht
m
l,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
g
it
-
b
i
sect: allow bisecting wi
t
h only
one bad
c
o
mmit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030: add a
b
it m
o
re te
s
ts to git
-
b
isect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
u
nio C Hamano
git-bisect: mod
e
rnization
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
J
unio
C
Ham
a
no
Rename
add_file_to_index() to
add_file_to_c
a
ch
e
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C H
a
mano
R
ena
m
e sta
t
ic v
a
ri
a
ble wri
t
e_i
n
d
e
x t
o
update_i
n
d
e
x
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C
Hamano
Ren
a
me
i
nternal function "
a
dd_file_t
o
_cac
h
e"
in builti
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Propagate ca
c
h
e
error internal to
refresh_ca
c
he()
v
ia
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
Fix
bogus error
message from me
r
ge-re
c
ursiv
e
error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Fix depen
d
e
n
cy of comm
o
n-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
RPM spec
:
incl
u
de git-p
4
in the
list
of
all p
a
ckag
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
rerere: make
sorting really stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ham
a
no
Fix switc
h
ing to a bran
c
h with
D
/F wh
e
n curr
e
nt branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Fix twoway_mer
g
e t
h
at
pass
e
d d/f confl
i
c
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 Ha
m
an
o
unpack-tre
e
s: get rid of *in
d
p
o
s paramete
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
unp
a
ck_tre
e
s
.
c: pass unpack_tr
e
es_opt
i
ons
struc
t
u
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
ad
d
_
cach
e
_ent
r
y
(
): removal of
file foo does not co
n
flict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Merge branch
'
j
c
/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
Merge branch 'fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merg
e
bra
n
ch '
p
os
t
1
.
5
.
1/blame
.
e
l'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
amano
Merge branch 'pos
t
1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
M
e
rge branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C H
a
mano
M
erge branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
gi
t
-read
-
tree --in
d
e
x-output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
_GIT_INDEX_OUTPUT: allo
w
p
l
u
mbing to output to an a
l
ternati
v
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
che
c
k
o
ut: allo
w
deta
c
hing to HEA
D
e
v
e
n
wh
e
n
s
wit
c
hing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
M
e
rge 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
Jun
i
o C Hama
n
o
rerere shou
l
d not repeat the e
a
rlier hu
n
ks in
l
ater
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio
C
Ha
m
ano
Ho
p
efully final upda
t
e
to th
e
draft Rele
a
se
N
ot
e
s
,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Ju
n
i
o
C
Hamano
Optional 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 both
e
r documenting fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C H
a
ma
n
o
U
pdate d
r
af
t
release
n
otes fo
r
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
unio C Hamano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Hamano
Merge branc
h
'mas
t
e
r
' of git://r
e
po
.
or
.
cz/git/
m
e
r
g
etool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Do
c
u
men
t
ation: unbreak us
e
r-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
mano
GIT
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
i
o
C Hamano
Update main git
.
h
t
ml page to point at 1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
io C Ham
a
no
Me
r
ge b
r
anch 'maint' to synchronize
w
i
th 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
Fix "--pretty=for
m
at:" fo
r
p
a
rent related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Hamano
g
i
t-commi
t
: "r
e
ad-tree -m HEAD
"
is
n
o
t
t
he
ri
g
h
t
w
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
s
h
a1_file
.
c
(
w
rite_sha1_f
i
le): De
t
e
c
t cl
o
s
e
failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
u
n
io C
H
amano
Document git
-
log --firs
t
-p
a
rent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C Hama
n
o
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio
C Hamano
Merge bran
c
h 'j
c
/fp
l
'
commit
|
commitdiff
|
tree
2007-03-26
Junio C
H
a
mano
Update README to
p
oint at a few
key p
e
riodica
l
messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ham
a
no
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch '
m
aint' of
g
it://linu
x
-nfs
.
org
/
~bf
i
elds
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ham
a
no
Merge branc
h
'js/remote-show
-
push'
commit
|
commitdiff
|
tree
2007-03-25
Juni
o
C Haman
o
Mer
g
e branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
git
-
am docu
m
enta
t
ion: describe what
i
s
tak
e
n from
wher
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
io C Hamano
make
th
e
p
re
v
io
u
s optim
i
zation work also on
path
-
limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
a
m
ano
rev-list --bisect: Fix
"
h
a
lfway" optimization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
Me
r
ge br
a
nch 'master'
into j
c
/bisect
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
next