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
Merge branch 'jc/attr'
2007-04-22
Junio C Hama
n
o
Merg
e
branch
'
j
c/attr'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o
C
H
amano
Merge bran
c
h 'lt/g
i
tlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Merge branch 'jp/
r
efs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch
'
jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Merge
b
ranc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C
H
amano
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Hamano
lockfile: record
t
he p
r
i
m
a
r
y
p
r
ocess
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hama
n
o
conv
e
r
t
.
c
:
r
es
t
ructure t
h
e attr
i
bute checking
p
art
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
Fix bogus l
i
nk
e
d-list management for user defin
e
d m
e
rge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
git-clo
n
e: fix dumb protocol t
r
ansport to clo
n
e from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
M
e
rge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docu
m
ent gitattributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ham
a
no
Update
'
crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Documentation: supp
o
r
t
manual
s
ection (5) - f
i
le f
o
r
m
at
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
M
e
rge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C H
a
mano
Simplify cod
e
to find recursiv
e
merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
J
unio C Hamano
Counto-fix
i
n mer
g
e-rec
u
rsive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
H
a
mano
Merge br
a
n
c
h 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
F
i
x fun
n
y t
y
p
e
s used in at
t
ribute value represe
n
tation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Al
l
ow
low-level driver
to specify diff
e
rent behaviou
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level
m
e
rge
driver: change th
e
c
o
nfigur
a
t
i
on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Allow the de
f
ault low-le
v
el merge driver to be c
o
nfigured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
H
amano
Cust
o
m
l
ow-level merge driv
e
r
supp
o
rt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io
C Ham
a
n
o
Merg
e
branch '
f
l/cvsserv
e
r'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Haman
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Up
d
at
e
d
raft release
notes
f
or
1
.
5
.
2 with accu
m
ulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
H
a
man
o
Start preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Ham
a
no
Merg
e
branch 'master' of git://repo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
n
o
Me
r
ge br
a
nch '
m
ain
t
'
of git:
/
/repo
.
o
r
.
c
z/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Me
r
ge br
a
nch
'
jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o C Hamano
Add
a
demonstrati
o
n/test
o
f customized m
e
rge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
A
l
l
ow sp
e
cifying sp
e
c
i
alized merge-backe
n
d
per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
git-gui:
H
o
n
o
r
TCLTK_P
A
TH if supplie
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
H
ama
n
o
merge-recur
s
ive: separate out xdl_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
m
a
no
A
llo
w
m
ore tha
n
true
/
false to a
t
tr
i
butes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C
Hamano
Make sure quickfetch is not
f
oole
d
w
ith a pr
e
viou
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch
'
js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Haman
o
send-email: do not leave
a
n empty CC: line if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
aman
o
Merge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Haman
o
Change attri
b
ute
negation
mark
e
r fr
o
m
'
!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C Hamano
Define a bui
l
t-in attribute
macro "b
i
n
a
ry"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io
C Hamano
attri
b
ute macro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile: add pa
t
ch
-
ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Fix 'dif
f
' a
t
tribu
t
e
s
emantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'crlf'
a
ttribute
s
e
m
an
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C
Hamano
M
erge
git://git2
.
kernel
.
org
/
p
u
b/sc
m
/
g
itk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hama
n
o
Tea
c
h 'd
i
ff' abo
u
t
'
d
i
ff' attrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
un
i
o C Haman
o
Define 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Add basic in
f
ras
t
ructure to assi
g
n
a
ttributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C
H
amano
M
e
rge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
i
o C
H
amano
Replace a pair
of patch
e
s
with u
p
dated ones for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Do not de
f
a
u
lt to --no-index when
given
two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hama
n
o
M
erge branc
h
'
j
c/che
r
ry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
F
ix git {log,show,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C
Ha
m
ano
Doc
u
ment
a
tion: --cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
g
i
t
-log --
c
her
r
y-pi
c
k A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
C
H
a
man
o
R
e
factor
p
atch-id
f
ilterin
g
out of g
i
t
-
c
herry a
n
d
g
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C Ha
m
a
n
o
Add %m to '--pretty=format:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge br
a
nch '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
J
u
nio C Ham
a
no
fsck: do not complain on detached HE
A
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Me
r
ge
b
r
a
nch '
m
a
i
nt
'
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
git-fetch: use fetch--
t
ool pick-
r
ref to avoid local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
git-fetch--tool pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3
0
30: merge-recursive backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io
C Hamano
merge-recursive: ha
n
d
l
e D/F conflict
c
ase
mo
r
e care
f
ully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hama
n
o
m
erg
e
-recursive: do not bar
f
on "to be
r
e
m
oved" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
T
r
e
a
t D/F conflict entry more carefully in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
t10
0
0: fix
c
a
se table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
s
hor
t
log -w:
m
ake wrap-l
i
ne behaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch '
j
c
/
push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
Hamano
Merge branch 'jc
/
merge-subtre
e
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C
Hamano
M
e
r
ge
b
ranch
'j
s
/fetch-progr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
M
e
r
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
H
amano
Add
D
ocum
e
ntation/cmd-
l
ist
.
made to
.
gi
t
ig
n
ore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
m
ano
Start 1
.
5
.
2 cycle by prepare
i
ng R
e
lNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'jc/read-tree-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
P
r
epare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A
n
e
w
merge
s
traget
y
'subtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to multiple loc
a
tions does not
stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C Hama
n
o
gi
t
-
push reports the URL after f
a
iling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'jc/index-
o
utp
u
t'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o C
Hama
n
o
Merge
bra
n
ch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
M
e
r
ge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C
Hamano
M
e
rge branch
'
jc/checkout
'
(e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C
H
amano
D
o
cumentation: tight
e
n
d
epen
d
en
c
y
fo
r
git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
git-bisect: allow
b
isecting
with
on
l
y one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
t
6
03
0
: a
d
d a bit more tests to g
i
t-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bisect: modern
i
z
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
M
e
rge
b
ranch
'
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Ren
a
m
e
a
dd_file_to_index() to
add_file
_
to_cache
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename static variab
l
e
w
rite_i
n
d
e
x to
up
d
a
t
e_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
Renam
e
intern
a
l function "add_file_to_cac
h
e"
in bu
i
ltin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
P
ropagat
e
cache error interna
l
to refresh_cache
(
)
v
ia
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next