repo.or.cz
/
git
/
gitweb.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
a
man
o
merge
-
recursiv
e
: sepa
r
ate out xdl_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Ham
a
no
A
l
low more than tru
e
/fa
l
s
e
to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Change attribute negatio
n
marker from '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Define a built-in at
t
ribut
e
macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
attribu
t
e macro
support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C
H
aman
o
Makefile
:
a
dd
p
atch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Fix 'diff
'
attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'crlf' attribute s
e
m
a
ntics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'diff'
a
b
out 'diff
'
attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio
C
Haman
o
D
e
f
in
e
'crlf'
a
ttr
i
b
u
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Add basic infrastructure to ass
i
gn attributes to pat
h
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
i
o C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
J
u
ni
o
C
Haman
o
Do not defaul
t
t
o --n
o
-ind
e
x
when given two di
r
ec
t
o
r
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch
'
jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
n
i
o C Haman
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
F
i
x git {log,show,
.
.
.
}
--pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
Doc
u
m
e
n
tation: --cherry
-
pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C Hamano
git-l
o
g --che
r
ry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor p
a
tch-i
d
filtering out
o
f git-ch
e
rry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add
%
m t
o
'--pretty=forma
t
:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge branch 'main
t
'
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
Junio
C Hamano
fsck:
do not
c
o
mplai
n
o
n
det
a
ch
e
d
HE
A
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge
b
ranch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Mer
g
e b
r
anch 'j
c
/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge
branch 'jc
/
m
erge
-
subtre
e
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merg
e
b
r
anch 'js/fetch
-
p
r
ogress'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Mer
g
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C
Hamano
A
dd Do
c
umen
t
a
t
io
n
/cmd-
l
is
t
.
made to
.
gitign
o
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Haman
o
Start
1
.
5
.
2 cyc
l
e by preparei
n
g RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
M
e
rge
b
r
a
nch 'jc/read-tree-df' (early
p
art)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
an
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Haman
o
Prepare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hama
n
o
A new m
e
rge stragety
'subtre
e
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
git
-
push to multi
p
le
locations
d
oes not sto
p
at t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
git-push
r
epo
r
ts
t
he URL after fail
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
branch '
j
c
/index-out
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C H
a
mano
M
erge branch
'
f
p/ma
k
e
-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Merge bra
n
ch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
J
u
ni
o
C Hamano
Merge
bran
c
h 'jc/chec
k
out' (ea
r
ly part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C
Hamano
Doc
u
mentation: tighten depend
e
n
cy for git
.
{ht
m
l
,
t
xt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
Hamano
git-bisect: a
l
low bisecting
w
ith only on
e
bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
a
no
t6030
:
add a bit
m
ore tes
t
s
to g
i
t-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Ha
m
a
n
o
git-bisect:
m
o
d
ernizati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C
H
amano
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C Ham
a
no
Rename a
d
d_file_to
_
i
n
de
x
() to add_
f
ile
_
to_cac
h
e
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C Haman
o
Ren
a
me static
v
ariable w
r
it
e
_index to update_inde
x
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Haman
o
R
e
name
i
nt
e
rnal func
t
i
on "add_file_to_cac
h
e"
i
n
builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Propagate
c
ache error internal t
o
r
e
f
resh_ca
c
h
e
() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Fix bogus err
o
r
me
s
sage
f
r
om
merge-recursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Haman
o
Fix
d
ependency
o
f common-cmd
s
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec: i
n
clude git-p4 in t
h
e list of all packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Haman
o
rerere: m
a
k
e
sorting really stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
Fix switching
t
o
a branch wi
t
h D/F when current bran
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
am
a
no
Fix twoway_merge t
h
at
p
assed
d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Fix read-
t
ree --
p
r
e
fix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack-trees: get rid of *indpos pa
r
ameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
H
amano
u
n
p
ack_trees
.
c:
pass u
n
pack_t
r
ees
_
opti
o
ns
s
tructure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
add_cache_entry(): removal of file foo does
n
ot con
f
lict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'jc/b
i
se
c
t'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Merge branc
h
'
f
l/doc
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merg
e
b
ra
n
ch 'post1
.
5
.
1/bla
m
e
.
el
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
an
o
Merge branc
h
'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
Hamano
Merge b
r
anch '
p
ost1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Ha
m
an
o
Merge bran
c
h
'l
t
/dirw
a
lk'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
Hama
n
o
git-read-
t
ree
--index-output=
<
f
i
le>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_GIT_INDEX_OUTPUT: a
l
lo
w
plumbing to output to an altern
a
tiv
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
c
heckout: allow d
e
t
a
ching to
HEAD even w
h
en switc
h
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
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
H
a
mano
GI
T
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Haman
o
rerere should not
repeat
t
he earlier h
u
nk
s
in l
a
t
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C
H
amano
Hopef
u
lly final u
p
d
ate to the draft Rele
a
se No
t
es
,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional T
c
k/Tk: ignore g
e
nerated fil
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C H
a
mano
Do no
t
b
o
ther
d
ocumentin
g
f
e
tch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Upda
t
e draft release notes for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
unio C Hamano
Merge branch
'
m
aint
'
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
amano
Merge b
r
anch 'master' of git://repo
.
o
r
.
cz
/
g
i
t
/me
r
getool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Ha
m
a
n
o
D
o
c
u
me
n
tation: u
n
break
user-manua
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
G
IT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
amano
Upd
a
te m
a
in git
.
html page to poin
t
at
1
.
5
.
0
.
6 documen
t
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hama
n
o
Mer
g
e branch 'maint' to synchron
i
ze wi
t
h 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
i
o
C
Hama
n
o
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
am
a
no
Fi
x
"--p
r
etty=format:" for
paren
t
r
e
l
ated i
t
ems
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C
Hamano
git-c
o
mmit: "
r
ead-tr
e
e -m
H
EAD
"
is
n
ot t
h
e right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C Hamano
sha1_file
.
c
(w
r
i
te_sha1_file): De
t
ect
cl
o
se failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Doc
u
ment
g
it-log -
-
first
-
parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C Ham
a
no
G
I
T 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hama
n
o
Merge branch 'jc/
f
p
l'
commit
|
commitdiff
|
tree
2007-03-26
J
u
n
io C Ha
m
ano
Upda
t
e R
E
A
DME to point at a few
key perio
d
ical messages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Ha
m
ano
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
erge
branch 'maint' of gi
t
://linu
x
-nfs
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ham
a
no
Merge branch 'js/remote-show-push'
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C
Hamano
Mer
g
e bra
n
ch '
m
aint
'
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
io C Hamano
git-a
m
documentation
:
d
escribe w
h
at is taken
f
rom where
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
a
m
ano
make
the previous op
t
imization work also on path-limite
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
rev-list --bisect: Fix "halfway" opti
m
ization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
J
unio C Hamano
Merge br
a
nch 'master
'
into jc/bisect
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o
C Hamano
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
next