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
Counto-fix in merge-recursive
2007-04-19
Junio C Haman
o
Co
u
nto-
f
i
x
i
n
me
r
ge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ha
m
ano
Fi
x
funny types use
d
in attri
b
ute value rep
r
esen
t
a
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Al
l
ow low-level d
r
i
ver to
specify differ
e
nt beh
a
viour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
m
ano
Custom low-level merge driver: change
t
he configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
A
l
low
t
he d
e
fault l
o
w-level
m
erge
d
river to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hama
n
o
Custom low-level merge driver
s
upport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a
demonstration/tes
t
of customized merg
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow specify
i
ng
s
pecialize
d
merg
e
-back
e
n
d per
p
ath
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Ha
m
ano
m
e
rge-r
e
cursive: separate
o
ut
xdl_
m
e
rge() int
e
rface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
an
o
A
l
l
o
w
more than tr
u
e/false to attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C H
a
man
o
Cha
n
ge attribute ne
g
ation 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 attribute ma
c
ro
"binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
uni
o
C H
a
mano
at
t
ribute macr
o
s
u
pport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
M
akefile:
add
p
atch-ids
.
h back
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
a
ma
n
o
Fix 'diff
'
attribute
s
e
m
antics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Fix 'cr
l
f' attribute seman
t
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
T
e
ach 'dif
f
' ab
o
ut 'diff' at
t
ribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C
H
a
man
o
De
f
ine 'crlf'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
un
i
o C Hamano
Add basic
in
f
r
a
str
u
cture to
a
ssign attribu
t
e
s to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C H
a
mano
Merge br
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
ama
n
o
Do not default to -
-
no
-
i
nde
x
whe
n
given
two direc
t
ori
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
M
erge b
r
anch 'jc/cherr
y
'
commit
|
commitdiff
|
tree
2007-04-13
J
u
n
io C Ha
m
ano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-13
J
uni
o
C Hamano
Fix
g
it {l
o
g,show
,
.
.
.
} --pr
e
tty=ema
i
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
D
ocument
a
tion:
--cherry-p
i
ck
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Haman
o
Refactor pat
c
h-id filte
r
in
g
o
u
t of g
i
t-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
C
H
a
mano
A
dd %m to '--prett
y
=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
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
c
k
: do no
t
co
m
plain
on
detach
e
d
HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
Merge bra
n
ch
'
jc/pu
s
h
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Me
r
ge branch
'
jc/merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
uni
o
C Hamano
Merge branch 'js/fe
t
ch-progres
s
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
Merge
br
a
nch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
H
a
m
ano
Add D
o
cu
m
entation/cmd-list
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C
H
amano
St
a
rt
1
.
5
.
2
cycle b
y
p
r
epar
e
i
n
g RelNotes for
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
man
o
Merg
e
branch '
j
c/read-tre
e
-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C
H
am
a
no
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
P
repare
f
or
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
A new merge strag
e
t
y
'
s
u
b
tree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
git-push to multiple location
s
d
oes n
o
t
sto
p
a
t
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
i
t-push repo
r
ts th
e
URL after
f
a
i
ling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
M
e
rge branc
h
'j
c
/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'cc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge branch 'jc/checkout
'
(early part)
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
a
m
ano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Haman
o
Documentation: tighten
d
e
pendency for git
.
{
h
t
ml,t
x
t}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
g
i
t-bisect: allow bise
c
ting w
i
th only one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
t6
0
3
0: add a bit more
te
s
t
s
t
o git
-
bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Jun
i
o C Ham
a
no
git-bis
e
ct: modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Merge br
a
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Rename add_file_to_in
d
ex() t
o
add_file_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
am
a
no
Re
n
ame sta
t
ic variable writ
e
_index to upda
t
e_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
m
a
no
Renam
e
internal function "a
d
d
_
file_to
_
cache" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Propagate cac
h
e
e
rro
r
internal to refresh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Fix b
o
gus error mess
a
ge fro
m
merge-
r
ecursive
e
rror
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Ha
m
ano
F
ix dependency
of com
m
on-c
m
ds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
R
PM spec: include git-p4 in the list o
f
a
ll
pack
a
ges
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere:
make so
r
ti
n
g
really stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C Hamano
Fix swit
c
hing to a branch with
D/F when c
u
r
r
ent branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Fix twoway_mer
g
e that
p
assed d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix read-tree --prefix=d
i
r
/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
u
n
p
ack
-
t
r
e
e
s:
g
et rid
o
f *indpos p
a
ram
e
t
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
u
n
pack_tree
s
.
c: pass
u
np
a
c
k
_
trees_opt
i
ons
s
truct
u
re
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
a
d
d_cache
_
entry(): re
m
oval
of file
foo does
not c
o
nflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Merge bran
c
h '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
Merg
e
bra
n
ch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge br
a
nch 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
M
erg
e
branch 'post1
.
5
.
1
/
p
4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merg
e
branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
H
amano
git-read-tree --index-out
p
ut=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
_GIT_INDEX
_
OUTPUT: all
o
w plumbing to
o
utput to an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
che
c
kout: allow detach
i
ng to HE
A
D even when s
w
itching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Mer
g
e 1
.
5
.
0
.
7 i
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
G
IT
1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
rerere should not repe
a
t th
e
earlier hunk
s
in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Ham
a
n
o
Hope
f
ully final u
p
dat
e
to the draft Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C
H
aman
o
O
p
t
i
o
na
l
T
c
k/
T
k: ignore gene
r
ated fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C
H
amano
Do
n
ot b
o
t
her documenting
f
etch--to
o
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Update draft release notes
f
or 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io
C Ha
m
ano
M
e
rge branch 'master' of git
:
/
/r
e
po
.
or
.
cz/git/me
r
getool
.
g
it
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Haman
o
Documentation: unbreak us
e
r
-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
ma
n
o
GI
T
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
io C Hamano
Update main git
.
h
t
m
l
pa
g
e to
point at 1
.
5
.
0
.
6 docu
m
entatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C
Hamano
Merge branch 'ma
i
nt'
to sy
n
chroni
z
e with 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
Junio C Hamano
F
i
x "--pr
e
t
t
y
=
f
ormat:" for parent related
i
tems
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-comm
i
t: "read
-
tree -m HEAD" is not the right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Juni
o
C Haman
o
sha
1
_f
i
le
.
c
(
w
r
ite_sh
a
1_file):
D
e
tect cl
o
se fail
u
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Juni
o
C
Hamano
D
o
cum
e
nt gi
t
-log --first-par
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GIT 1
.
5
.
1-r
c
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hama
n
o
Merg
e
branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
J
uni
o
C
Hamano
Update README
t
o
point at a few key periodi
c
al messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
next