repo.or.cz
/
tgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix funny types used in attribute value representation
2007-04-18
Junio C Hamano
Fi
x
funny type
s
used i
n
attribu
t
e value
r
epr
e
se
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Allow low-level d
r
iver
to s
p
ecify
different behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
m
ano
Custo
m
low-level m
e
rge
d
river: change the con
f
iguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Allow the de
f
aul
t
low-l
e
vel m
e
r
g
e driver to be co
n
figured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Cu
s
to
m
low-level merge driver
s
u
p
port
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hama
n
o
Add a
demon
s
t
r
at
i
on/test of
c
ustomized me
r
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C
H
amano
Allow specifyin
g
spec
i
alized merge-bac
k
en
d
per
p
ath
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C
H
amano
me
r
ge-r
e
cursive: separ
a
te out xdl_merge
(
)
i
n
ter
f
ace
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
io C
H
a
mano
Allow mor
e
than true/f
a
ls
e
t
o attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
C
hange attribute negation marker
from '!' to
'
-
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Hamano
Define a b
u
ilt-in attribute ma
c
ro "bin
a
ry"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribute macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile
:
add patch
-
ids
.
h
b
ack in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hama
n
o
F
ix 'diff' attribu
t
e semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
am
a
no
F
i
x
'c
r
lf' attribu
t
e semant
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio
C Ham
a
no
Teach 'dif
f
' about 'diff' at
t
r
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio
C Hamano
De
f
ine '
c
rlf' att
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Add basic infr
a
str
u
cture to
assi
g
n attributes t
o
paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C H
a
mano
Do not
d
e
fau
l
t to --no-
i
n
d
ex when
g
iven two dire
c
to
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Merge branch 'jc/ch
e
rr
y
'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Ham
a
no
Fix git {log,s
h
ow,
.
.
.
} --p
r
etty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documen
t
ation: --cherry-
p
ick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --cherr
y
-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
Refa
c
to
r
p
a
tch-id filtering out of gi
t
-cherr
y
and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--pre
t
ty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hama
n
o
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hama
n
o
f
s
ck:
d
o
not
compla
i
n on
detached HE
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
Mer
g
e branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
M
e
rge b
r
anc
h
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io
C Hamano
Merg
e
branc
h
'
jc/merge-subtree
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
branch
'
j
s/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
J
unio
C Haman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C
H
amano
Add Documen
t
ation/cmd-list
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Start 1
.
5
.
2 cycle
b
y
preparein
g
R
e
l
N
o
tes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Merge branch 'jc/re
a
d-tree-df' (earl
y
part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-08
J
unio 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
Haman
o
A new merge
st
r
agety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C Hamano
git-push
t
o multiple lo
c
ations does n
o
t stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
git-push reports the U
R
L after fai
l
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
b
ranch
'
jc
/
i
n
dex-output
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
M
e
r
g
e
br
a
nch 'f
p
/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Merge
b
ranch 'cc
/
bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Me
r
ge branch 'jc/checkout' (ear
l
y part)
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
Hamano
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
J
uni
o
C Hamano
Documentatio
n
: tigh
t
en
d
e
p
endency for git
.
{
h
tml,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
amano
git-bisect
:
a
l
low bisec
t
ing wit
h
on
l
y one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t
6
030: add a bit more tests
t
o git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
u
nio C Hamano
g
i
t-bisect:
m
oderni
z
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
M
e
r
g
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hama
n
o
Rename
a
d
d_f
i
l
e_to_i
n
d
ex() to ad
d
_file_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
a
m
ano
Rename st
a
tic vari
a
b
le wr
i
te_in
d
ex
t
o upd
a
t
e
_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Ham
a
n
o
Re
n
a
me internal func
t
ion
"
add_file_to_cache" in buil
t
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Ham
a
no
Prop
a
gate
ca
c
he e
r
ror
i
n
t
ernal to refresh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fi
x
bog
u
s error
message from merge-recursive e
r
ro
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
Fix dependen
c
y
o
f c
o
mmon-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C Hamano
RPM spec: in
c
lud
e
gi
t
-
p
4 i
n
the
li
s
t
of
all
p
ackages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hama
n
o
r
erer
e
: make sorting rea
l
l
y
stabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Hamano
Fix switching to a branc
h
w
ith
D/F when curre
n
t
b
r
anch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
ma
n
o
Fix twow
a
y_merge
t
hat passed
d
/f
c
onfli
c
t marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
Fix read-tree --prefix
=
dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o
C
H
amano
un
p
ack-trees
:
get r
i
d of *indpos
p
aram
e
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack_trees
.
c
:
pass unpack_t
r
ees_option
s
structu
r
e
.
.
.
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 not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge b
r
anc
h
'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hama
n
o
Merge branch 'fl
/
d
o
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Merge b
r
anch 'pos
t
1
.
5
.
1/b
l
ame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'p
o
st
1
.
5
.
1/t
c
l
t
k'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
M
erge branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch '
l
t/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
git-
r
e
a
d-
t
ree
-
-inde
x
-output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
Hamano
_GIT_I
N
DEX
_
O
U
T
PUT: allow p
l
umbing to o
u
t
put
to an a
l
te
r
nativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
checkou
t
: allow det
a
ching to HEAD even
whe
n
switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o C Ha
m
a
no
GI
T
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C H
a
mano
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 no
t
r
e
p
eat the earlier hun
k
s in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C
H
a
m
a
no
H
o
peful
l
y final update to
t
he draft Rele
a
se Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Ham
a
n
o
Opt
i
o
n
al Tck/Tk: ignore gener
a
te
d
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C H
a
mano
Do not bother do
c
umenting fetc
h
--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
U
p
date dr
a
ft 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
a
mano
Merge branc
h
'
m
aste
r
' of gi
t
:
//re
p
o
.
or
.
cz/git/merg
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Hamano
Docum
e
ntation: unbreak user-
m
an
u
al
.
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
Junio C Ha
m
ano
Update
m
ain git
.
html page to po
i
nt at
1
.
5
.
0
.
6 documentat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
Merge branch 'ma
i
nt' to sy
n
chronize
w
ith 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
unio C H
a
ma
n
o
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
Fi
x
"
--pretty=format:" for parent re
l
ated items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Ha
m
ano
g
i
t-com
m
it: "read-
t
ree -m HEAD" is not the
right wa
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C
H
amano
s
h
a1_file
.
c
(
wr
i
te
_
sha1_file): Detect clos
e
f
ailure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Document git-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-rc
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Haman
o
Merge br
a
nch 'jc/fp
l
'
commit
|
commitdiff
|
tree
2007-03-26
J
unio C Hamano
Update README to point at
a
few key p
e
riodical mes
s
ages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C
H
a
man
o
Me
r
g
e br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-25
J
u
n
i
o
C Hamano
M
e
rge branch
'maint' of
git://linux-n
f
s
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
next