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
Add --date={local,relative,default}
2007-04-26
Junio C Hamano
A
d
d --date=
{
l
o
cal,rel
a
tive,d
e
fault
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
J
unio C Hamano
Merge
br
a
n
c
h 'jc/the
-
i
ndex'
commit
|
commitdiff
|
tree
2007-04-25
Junio C
H
a
man
o
Merge bra
n
ch
'
mk
/
diff'
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Haman
o
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch 'master' of git://repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
ap
p
lymbox & quil
t
i
m
por
t
: ty
p
ofix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Haman
o
gitattributes documentation: clarify o
v
e
r
ridi
n
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t/
t
e
st-lib
.
s
h: Protect ourse
l
ves from
c
o
mmon misconfigur
a
tio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Diff be
t
ween two blob
s
should take mode changes
i
nto
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
H
amano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Build RPM wi
t
h E
T
C_GITCONFIG=
/
et
c
/gitconfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
ano
t
6030: grab co
m
mit ob
j
ect nam
e
as we go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio
C
Ham
a
n
o
t5302: avoid us
i
n
g
t
a
il -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio
C Ha
m
ano
Docu
m
ent
"d
i
ff
=
driver" attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C H
a
mano
Make
read-
c
ache
.
c "the_index" free
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
Move
inde
x
-rel
a
ted variables into a structu
r
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C
H
ama
n
o
S
upport 'd
i
ff
=
pgm' attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io
C
Hamano
p
ack-ob
j
e
c
t
s
: make generated packfile read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
n
io
C Haman
o
U
pdate tes
t
s not t
o
ass
u
me that
g
enera
t
ed
packfile
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C
H
am
a
n
o
Fix
'quickf
i
x' on pack-
o
b
jects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
H
a
m
an
o
p
a
ck-o
b
jects: quickf
i
x for perm
i
ss
i
on modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Updat
e
draft rel
e
as
e
notes for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Ham
a
n
o
Docum
e
ntation/Makefile
:
fix section (5) ins
t
a
l
l
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
U
p
dat
e
documentation links to poin
t
a
t v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Me
r
ge branch 'lt/ob
j
alloc'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C
Hamano
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch
'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio
C
H
amano
Merge branch
'
l
t
/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge branch 'np/pa
c
k'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
io C
H
amano
Merge
b
ranch 'jp
/
refs'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Ha
m
ano
M
e
rge branch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
J
u
ni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
GI
T
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfile: r
e
cord th
e
primary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C
Hamano
convert
.
c: rest
r
u
c
ture the
a
t
t
ribute checki
n
g pa
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio
C
Haman
o
Fix bogu
s
link
e
d-list management fo
r
user
def
i
ned merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
gi
t
-clone: fix dumb pr
o
to
c
ol tran
s
port to
clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hamano
git-add -u: match the index
w
i
th working t
r
e
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio
C
H
amano
Merg
e
br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
Document gitattrib
u
tes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Update 'crlf' attribute se
m
antics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
Documentat
i
on: support manual section (5)
-
file formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ha
m
ano
Merge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-19
J
unio
C
Haman
o
Simplify code to find
r
ec
u
rsive
merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fix in merge-recurs
i
ve
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
a
mano
F
ix funny types used
in
a
ttribute
v
a
lue representation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
All
o
w low-leve
l
driver to specify
d
ifferent
behavio
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Ham
a
no
Custom low-level m
e
rge dri
v
e
r
: change
t
h
e con
f
i
g
uration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Allow
the default
l
o
w
-level merge driver to be
configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Cus
t
om low-leve
l
merge driver sup
p
ort
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Merge br
a
nch
'
fl/c
v
sserver
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
U
pda
t
e draft release notes
f
o
r 1
.
5
.
2 with accumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
a
n
o
Start preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge bran
c
h '
m
aster' of git://repo
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hama
n
o
Merge branch 'maint' of git
:
//r
e
po
.
o
r
.
cz/git-
g
ui
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
Hamano
Merg
e
branch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
d
d a
d
emonstration/
t
es
t
o
f customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
H
am
a
no
A
llow specif
y
ing
specialized
m
erge-backen
d
p
e
r path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
git-gui: Hon
o
r
T
CLTK_
P
ATH if sup
p
l
i
ed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
merge-recur
s
ive: sepa
r
at
e
out
xdl
_
m
e
r
ge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
Allow
m
o
re than true
/
false
to
a
ttributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C
H
amano
Make sure q
u
ic
k
fetch is not fo
o
led wit
h
a previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C
Hamano
Merge
b
ranch 'j
s
/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hamano
send-
e
mail: do not leave
an empty C
C
: line
i
f
n
o
cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C H
a
ma
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
Hamano
Cha
n
ge
attribute
n
e
gation marker f
r
om '!' to
'-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Define a built-i
n
attri
b
ute
macro
"bina
r
y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
attribute macro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
H
a
ma
n
o
Ma
k
e
file: a
d
d p
a
tch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hama
n
o
F
i
x
'
d
iff' att
r
i
b
ute semant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
H
a
mano
F
i
x '
c
r
l
f' attribute semant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
un
i
o
C Hamano
Merge git://git2
.
kernel
.
org/pu
b
/sc
m
/gitk/gitk
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach '
d
if
f
'
a
b
o
ut 'd
i
ff'
a
ttri
b
ute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Hamano
Add
b
asic infrastruct
u
re to assign attributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
M
erge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-14
J
u
ni
o
C Hamano
Repl
a
ce a pair of patches w
i
t
h
upd
a
ted ones for subproje
c
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C Hamano
Do not def
a
ult to --no-index w
h
e
n given two d
i
rect
o
r
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C
H
amano
M
e
rge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Ham
a
no
Merge branch
'
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Haman
o
F
i
x
g
i
t {lo
g
,show,
.
.
.
}
--pr
e
tty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C
Hamano
Docu
m
entat
i
on: --
c
herry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Ha
m
an
o
git-log --cherry-pick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Refactor pat
c
h-id filtering out of git-ch
e
rry
a
n
d gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hama
n
o
Ad
d
%m to '--p
r
etty=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
amano
G
I
T 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Juni
o
C
Hamano
fsck: do not complai
n
on detached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C H
a
m
a
n
o
Me
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io
C H
a
m
ano
git-fe
t
ch: use fetch--tool pick-rref to avoid lo
c
al
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
aman
o
g
it-fetch--tool pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
t3030
:
merge-recursive
b
a
c
ken
d
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
merge-recu
r
sive:
h
andle
D
/F
con
f
lict ca
s
e more c
a
r
efully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Hamano
merge-recursive: do not barf on "to b
e
r
emov
e
d
" entr
i
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C Hamano
Treat
D
/
F
c
onflic
t
e
n
t
r
y
m
ore
carefully i
n
unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
t1
0
00: fi
x
ca
s
e
t
a
b
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next