repo.or.cz
/
git
/
ljr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix read-tree merging more than 3 trees using 3-way merge
2007-08-16
J
unio C Hamano
Fi
x
read-tr
e
e mergin
g
m
ore than 3 t
r
ees using 3-way
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-15
Junio C Hamano
GIT 1
.
5
.
3-rc5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-15
Junio C
Hamano
a
t
tr
.
c
:
read
.
gitat
t
ributes fr
o
m
i
ndex as well
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-15
Junio C Ha
m
a
n
o
att
r
.
c: refac
t
oring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-15
Ju
n
io
C H
a
mano
merg
e
-
rec
u
rsive: do not r
u
dely di
e
on
binary merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-14
Junio C
H
aman
o
git-diff: sq
u
elch "e
m
pty"
d
i
ffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-13
Ju
n
io C Hamano
builtin-bund
l
e
creat
e
- us
e
lock_
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-13
Ju
n
io C H
a
mano
t3404: fix "fak
e
-
e
dit
o
r
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-13
J
unio C Hama
n
o
Merge
b
r
a
nch
'
maste
r
' of git://
g
i
t
.
kernel
.
o
r
g
/
p
u
b/sc
m
.
.
.
commit
|
commitdiff
|
tree
2007-08-11
Junio C Hamano
Mer
g
e branch 'cr/t
a
g'
commit
|
commitdiff
|
tree
2007-08-11
Junio C Hama
n
o
Merge branch
'
jc/clone'
commit
|
commitdiff
|
tree
2007-08-11
Junio
C
Hamano
a
llow git-bundl
e
to cr
e
ate
b
o
t
tomless bundle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-11
Junio C Hamano
allow git-bun
d
le to create bottomless bundle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-10
Jun
i
o
C
H
amano
M
e
rge branch
'lt/re
a
dtre
e
'
commit
|
commitdiff
|
tree
2007-08-10
Junio C Hamano
Optimize "diff
-
-cached" pe
r
for
m
a
nce
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-10
J
u
nio C Hamano
Revert "tweak manpa
g
e
formatting"
commit
|
commitdiff
|
tree
2007-08-10
Jun
i
o
C
Hama
n
o
t
w
eak manpage formatting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-10
Junio C Hamano
Fix a
n
illustration in git
-
rev-parse
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-10
J
u
nio C
H
amano
F
i
x formatting of g
i
t-bl
a
me docume
n
tation
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-08
Jun
i
o
C
H
a
m
ano
R
e
order the lis
t
of c
o
mmands in the manual
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-07
Junio C Ham
a
no
Fix "make GZ=1 qu
i
ck-i
n
s
t
all-doc"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-07
Junio C Hamano
p
a
ger: fin
d
out pager setting from configura
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-06
Junio C
H
a
m
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-08-06
Junio C Hamano
setu
p
.
c:verify_non_fil
e
name():
d
on't
d
ie
unnecessarily
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-06
Junio
C Hamano
Merge branch 'm
a
s
ter' of git:/
/
l
i
nux-nfs
.
org/~bf
i
elds/git
commit
|
commitdiff
|
tree
2007-08-05
Junio
C
Hamano
user-
m
a
n
ual:
m
ention git stas
h
commit
|
commitdiff
|
tree
2007-08-05
Junio C Ha
m
ano
Fix
i
nstall-doc-q
u
ick targe
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-05
Jun
i
o C Hamano
unpack-tree
s
.
c: a
s
sume submodules are clean during
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-04
Ju
n
io C Hama
n
o
INSTALL: add war
n
ing on docbook-xs
l
1
.
72
a
n
d 1
.
73
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-04
Junio C Hamano
git-com
p
l
etion:
a
dd
"
git stash"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-03
J
u
n
i
o
C
Ham
a
no
GIT 1
.
5
.
3-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-03
Junio C Hamano
Fix bogus us
e
of
p
rintf in t3700 te
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-03
Junio C
Hama
n
o
gitweb: do not choke on recursive symlink
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-03
Junio C Hamano
Fix work-tree
relat
e
d breaka
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-02
Junio C
Hamano
Rel
N
o
t
es 1
.
5
.
3 updates before -rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-02
Ju
n
io C Hamano
g
i
t-clo
n
e: ag
g
ressively optimize local c
l
one behaviour
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-02
J
uni
o
C
H
amano
git-commi
t
.
s
h:
P
ermit the --amen
d
message to be given
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-08-01
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-07-31
Junio C Hamano
git
.
c: e
x
ecution p
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-31
Jun
i
o
C Haman
o
Unset
GIT_ED
I
TOR while r
u
nning tes
t
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-31
Juni
o
C Haman
o
ad
d
_
fi
l
e_to
_
index: skip re
h
a
shing if the cached stat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-30
Junio C Hamano
rebase: t
r
y not
to mu
n
ge commit
log
m
essa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-30
J
u
nio C Hamano
symbolic-re
f
, update-ref:
d
o not re
f
use r
e
fl
o
g message
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-30
Junio C H
a
m
a
no
l
o
g_r
e
f_writ
e
() -- do n
o
t chomp refl
o
g message at the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-30
Junio C Hamano
M
e
rge
b
ranch
'bs/lock'
commit
|
commitdiff
|
tree
2007-07-30
Junio C Hamano
Merg
e
b
ranch
'
master' of
git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-07-28
Junio C Ham
a
no
git
-
stash apply --index
:
o
p
timiz
e
postp
r
oce
s
sing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-28
Junio C Hamano
F
i
x
git-s
t
ash apply --index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-28
Juni
o
C Hamano
M
e
rge
b
ra
n
ch
'master' of git://git
.
ke
r
nel
.
org/pub/
s
cm
.
.
.
commit
|
commitdiff
|
tree
2007-07-27
Junio C
H
am
a
n
o
Add test f
o
r sy
m
linked co
n
f
igurat
i
on file updat
e
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-27
Jun
i
o C Ha
m
a
no
git-
s
tas
h
:
do
n
ot remove a ref by h
a
nd
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-26
Junio C H
a
mano
Upd
a
t
e descriptio
n
of -z option
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-26
Junio C
H
a
mano
git_m
k
st
e
m
p
(): be ca
r
eful n
o
t
t
o
o
verflo
w
the path
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-25
Junio
C
Hamano
When locking in
a
symlink
e
d reposit
o
ry,
t
ry to lock
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-25
Junio C Hamano
gi
t
-
submodule:
r
emove redundant call to
git
-
de
s
cribe
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-25
Junio C Hamano
git-submodu
l
e module_name: avoid us
i
ng unwieldy
"
val
u
e_regex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-25
Junio C H
a
mano
gitw
e
b: fix br
o
ken snapshot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-25
Junio C Hamano
Make s
u
r
e git-sta
s
h wo
r
ks
f
rom subdirectory
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-25
Junio C Hamano
GIT 1
.
5
.
3-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-25
Junio
C
H
a
mano
t9200:
Be careful
whe
n
checking CVS/Entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-24
Junio C
H
aman
o
user-manual: fix typolet
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-24
J
u
n
i
o C
H
amano
Mark us
e
r-m
a
n
u
al as UTF
-
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-22
J
u
nio C Hamano
S
y
nonyms: -i == --regexp-ignore
-
c
a
se
,
-E == --e
x
t
e
nded
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-22
Junio
C H
a
mano
Fix VISU
A
L
/
EDITOR preferen
c
e order in
D
ocumentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-19
Junio C Hamano
Merge branch 'master' of git:/
/
p
eople
.
f
r
eedesktop
.
or
g
.
.
.
commit
|
commitdiff
|
tree
2007-07-19
Junio C Ham
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-07-18
J
unio C
H
ama
n
o
Do no
t
expect
unlink(2) to fail
o
n
a
directory
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-17
Junio C Hamano
Upda
t
e
INS
T
ALL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-15
J
unio C Hamano
GIT v1
.
5
.
3-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-15
J
unio C Hamano
Merge branch 'ma
s
ter' of git://rep
o
.
or
.
cz/git
/
fastimport
commit
|
commitdiff
|
tree
2007-07-15
Junio C
H
am
a
no
Do
c
ume
n
tation/g
i
t-com
m
it-tree: remov
e
description o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-14
Junio
C
Hamano
Update
.
mailmap
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-14
Junio
C
Hamano
Add con
t
rib/stats/mailmap
.
pl script
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-14
Ju
n
io C Haman
o
Docum
e
nt ne
w
--date
=
<
f
or
m
at>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-14
Junio C Ha
m
a
no
Wire new
d
ate forma
t
s to --date=<fo
r
mat> parser
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-14
Junio C
H
amano
Make
s
how_rf
c
2822_da
t
e()
j
ust an
o
ther date
o
utput
format
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-14
Junio C
Hamano
Mer
g
e branch 'master' of g
i
t
:
//g
i
t
.
k
e
rnel
.
o
r
g/pub
/
scm
.
.
.
commit
|
commitdiff
|
tree
2007-07-12
Jun
i
o
C Ham
a
no
GIT v1
.
5
.
3-
r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-12
Ju
n
i
o
C
Hamano
Merge branch 'master' of g
i
t://git
.
kern
e
l
.
org/pub/scm
.
.
.
commit
|
commitdiff
|
tree
2007-07-12
J
u
nio
C
Hamano
Update list of olde
r
git d
o
cs
commit
|
commitdiff
|
tree
2007-07-12
Juni
o
C H
a
mano
M
erge commit 'gi
t
-g
u
i/master'
commit
|
commitdiff
|
tree
2007-07-12
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-07-12
Ju
n
io C Hama
n
o
GIT 1
.
5
.
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-12
Junio
C Hamano
Teach read-tree 2-way me
r
ge to ignore inte
r
m
ediate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-12
Ju
n
io C Hamano
Merg
e
br
a
nch '
m
ain
t
' of
g
i
t://repo
.
or
.
cz/git-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2007-07-12
Junio
C Hamano
Re-code
buil
t
in-branch
.
c in
U
TF-8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-10
Ju
n
io C Hamano
Me
r
ge b
r
anch 'bd/delta'
commit
|
commitdiff
|
tree
2007-07-09
Junio C H
a
mano
Revert 88494423
(
r
e
m
oval of
d
upl
i
ca
t
e
p
are
n
ts in
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-09
Junio C Hama
n
o
revision
.
c: rem
o
ve dup
l
ica
t
ed parents aft
e
r history
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-09
Junio C
H
amano
Document custom h
u
n
k head
e
r
select
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-09
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-07-09
Ju
n
io C Ham
a
no
Fix merge-one-file for our-si
d
e-
a
dd
e
d/our-side-remov
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-09
Junio C H
a
m
a
no
git-stash:
tr
y
r
e
using
cached stat
i
nf
o
as much as
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-09
Junio C Hamano
git-gui
:
use "
b
lame -w -C -C" for
"wher
e
did it come
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-08
Juni
o
C Hamano
diff
.
c: m
a
k
e
bui
l
t-in hunk h
e
ader
pattern
a
separ
a
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-07
Junio C Hamano
gi
t
web:
make repeate
d
c
alls to git_get_project_owner
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-07-07
Junio C Haman
o
Merge
bran
c
h '
j
s/
s
tash'
commit
|
commitdiff
|
tree
2007-07-07
J
unio C Hamano
Merge
b
ranch 'jc/diff-mark'
commit
|
commitdiff
|
tree
2007-07-07
Junio
C
H
a
mano
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-07-07
Junio C
H
amano
diff: h
o
no
r
b
i
nar
i
ness spe
c
ified in a
t
tributes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next