repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6030: grab commit object name as we go
2007-04-24
Junio C
Ham
a
no
t6030: grab c
o
mmit object name a
s
w
e go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t5302: av
o
id using tail
-
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Document "diff=
d
river" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Hamano
Support
'
d
i
ff=pg
m
' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
pack-objects: make ge
n
e
r
ated pa
c
kfile read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Update t
e
s
ts no
t
t
o
assume
that generate
d
pac
k
fi
l
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Ha
m
a
n
o
Fix 'qu
i
ckf
i
x
' on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
pack-obje
c
ts
:
qu
i
ckfix for p
e
rmission
mo
d
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C
Hamano
Up
d
a
t
e
dr
a
ft
release n
o
tes
f
or v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C Ha
m
ano
Docume
n
tat
i
on/Makefile: fix
section (5) installation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Update do
c
umentation link
s
to
p
oint
at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Merg
e
branch 'lt/objall
o
c'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge bra
n
ch 'jc/
a
ttr'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
H
a
m
ano
Merge br
a
nch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Ham
a
no
M
e
rge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Merge bra
n
c
h 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hama
n
o
M
erge b
r
anch '
j
c/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Merge
b
ranch '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
Juni
o
C
H
amano
lockfile: r
e
cord
t
he primary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
convert
.
c
:
r
e
structur
e
the a
t
tribute chec
k
in
g
part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Hamano
F
ix bogus linked-lis
t
managemen
t
for user defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
a
m
a
no
git-c
l
one: fix dumb
p
rotoc
o
l tran
s
port
to cl
o
n
e from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
un
i
o
C
H
amano
git-add -u: match
t
he
in
d
e
x w
i
th work
i
n
g tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
D
o
cume
n
t gitat
t
ributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C H
a
mano
Update
'
crlf' attrib
u
te semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Haman
o
Document
a
tion: support manual
s
ectio
n
(5) - fil
e
formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hamano
Simplify code to find re
c
ursi
v
e m
e
r
ge dr
i
ver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
amano
Counto
-
fix in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ha
m
ano
Mer
g
e branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
H
amano
Fix
f
u
n
ny types
used in attribute value represent
a
ti
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
A
l
low
l
ow-
l
evel driver to spec
i
fy
d
ifferent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
C
u
stom low-level m
e
rge driver:
chan
g
e the configurati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C
H
amano
Allow the d
e
fault low-l
e
ve
l
merge driver to
be confi
g
ured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Cust
o
m low-level merge d
r
i
ver
support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge branch 'fl
/
cvsserv
e
r
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Ham
a
no
U
pdat
e
dra
f
t rel
e
ase
notes for
1
.
5
.
2
wi
t
h
a
c
c
umulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
an
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
S
tart preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge branch
'
master' of git:
/
/
repo
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hama
n
o
M
erge branch 'maint'
o
f git:
/
/
r
e
po
.
or
.
cz/git-gui
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
m
an
o
Mer
g
e branch 'jc
/
re
a
d-tree-d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
A
dd
a
demonstration/t
e
st
o
f
customized mer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Haman
o
Allow
s
pecifyin
g
speci
a
lized merge-back
e
n
d
per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Ha
m
a
no
git-gui: Honor T
C
L
T
K_PATH if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Ha
m
ano
merge-
r
ecursive: separat
e
o
ut x
d
l_merge
(
) interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ha
m
an
o
Allo
w
m
o
re than true/
f
alse to
attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make s
u
re quickfetch is not f
o
o
l
ed
w
ith a
p
r
ev
i
ous
.
.
.
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
Jun
i
o
C Hamano
send-em
a
i
l
: do not leav
e
an empty CC: line if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Haman
o
Me
r
g
e branch
'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
Hamano
C
hange attr
i
bute negation marker from '!' to
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C Hamano
De
f
ine a bu
i
lt-
i
n a
t
t
ribute macro "binary
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
attrib
u
t
e macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Make
f
il
e
: add patch-i
d
s
.
h
back
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Fi
x
'di
f
f' attribute sema
n
t
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Haman
o
Fix 'crlf
'
a
t
tribut
e
s
e
mantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Merge git://git2
.
kernel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
T
e
ach '
d
iff'
about 'd
i
ff' attri
b
ute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Define 'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C
H
amano
A
dd
ba
s
ic inf
r
astructure
to as
s
ign attributes
t
o pat
h
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C Ham
a
no
Replace a pair
of pa
t
c
hes with u
p
dated ones for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
D
o
n
o
t
default to --n
o
-index when
given two directori
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
amano
Merge b
r
anch 'jc/ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
n
io C Hamano
M
erge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
no
Fix gi
t
{log,sho
w
,
.
.
.
} --pre
t
t
y
=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
m
a
no
Documentat
i
on:
-
-cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Ha
m
ano
git-log --cherry-pi
c
k A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
Re
f
a
cto
r
patch-i
d
filtering out of git-cherry a
n
d g
i
t
.
.
.
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
J
u
nio C Hamano
Merge
branch
'maint
'
commit
|
commitdiff
|
tree
2007-04-12
Junio 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 Ha
m
ano
fs
c
k: do
not
complain on deta
c
hed HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
Merge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
g
i
t-fetch: use
f
etch-
-
tool p
i
ck-rref
t
o
avoid local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
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
t3030: merg
e
-recursive backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-recursive: handle D/F conflict
case mor
e
carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
merge-rec
u
rsive: do
no
t
barf on "to be r
e
m
o
ved" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
Trea
t
D/F conf
l
ict
e
n
try 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
t1
0
00: fix
case
table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C H
a
ma
n
o
shortlog -w: make
wrap-lin
e
beh
a
viour optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Merge branc
h
'jc/merge-sub
t
ree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Ham
a
no
Me
r
ge br
a
nch 'js/fetch
-
progre
s
s'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
i
o
C Ham
a
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
Add
Documentation/cmd-li
s
t
.
m
ade
t
o
.
gitign
o
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
St
a
rt 1
.
5
.
2
cycle b
y
prepareing
R
elN
o
tes
for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
ni
o
C Ha
m
an
o
Me
r
g
e branch
'
jc/read-tre
e
-df
'
(ear
l
y part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
Merge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o
C
Hamano
Prepare
f
or
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
A
n
ew merge str
a
g
et
y
'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
git-p
u
sh to
m
u
ltipl
e
locations doe
s
not stop at th
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
H
a
ma
n
o
g
i
t-push reports the URL af
t
er faili
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next