repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Keep rename/rename conflicts of intermediate merges while doing recursive merge
2007-03-30
Jun
i
o C H
a
mano
Do not bo
t
her documen
t
ing
fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Update draft
release notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Ham
a
no
M
e
r
ge
branc
h
'
m
a
int'
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Hamano
M
e
rge branch
'
master' of
g
it://rep
o
.
or
.
cz/
g
it/mergetoo
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Hamano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
Update main git
.
h
t
ml pa
g
e to
point at 1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Me
r
g
e branch 'maint'
to synch
r
onize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C
H
amano
G
I
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
F
i
x "--pretty=format:" for parent
r
e
lated
items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
g
i
t
-
commit: "re
a
d
-tree -m HEA
D
" is
n
ot the right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io C Hamano
sha1_file
.
c (write
_
sha1_f
i
le): De
t
ec
t
close fail
u
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
H
aman
o
Docum
e
nt git-log --first-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C
H
amano
Merge branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hama
n
o
Upd
a
t
e
READ
M
E to poi
n
t
at a f
e
w key periodical messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Haman
o
Merge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hama
n
o
Me
r
ge branch 'm
a
int'
o
f git:/
/
l
inu
x
-nfs
.
org/~
b
fields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
Haman
o
Merge branch 'js/remote-show-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio C
H
a
m
ano
Me
r
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
J
u
ni
o
C Hamano
git-
a
m documentatio
n
: descri
b
e w
h
at is taken from
wher
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ham
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Juni
o
C Hamano
F
ix path-limited "rev-li
s
t --
b
is
e
c
t
" termination
co
n
diti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C
Hamano
git-bisect
.
sh: pro
p
erl
y
dq $
G
IT_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
J
u
nio C
Haman
o
git-bisect: typo
f
ix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C
H
a
mano
checkout: report
w
here t
h
e new HEAD is upon detaching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
gi
t
-a
p
p
l
y
:
D
o not f
r
ee
t
h
e
w
rong
buffe
r
wh
e
n
w
e convert
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
Merge git://git2
.
ker
n
e
l
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
git
-
rebase:
m
ake 'r
e
base
HEAD branch' work as e
x
p
e
cted
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C Hamano
tree_
e
nt
r
y_in
t
e
resting(): allow
i
t to
say "everyt
h
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Ha
m
an
o
t
r
e
e-
d
iff
:
avo
i
d strncmp
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Teach tr
e
e_entry_
i
nteresting() tha
t
the tr
e
e entr
i
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Junio C Hamano
bla
m
e
: cmp_suspect is
n
o
t "cmp" a
n
y
more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Ju
n
io C Hamano
M
e
rge gi
t
://g
i
t2
.
ke
r
nel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-20
Junio C
H
aman
o
blame: micro-optimize cmp_suspect(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C
Hamano
GIT 1
.
5
.
1-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Ju
n
i
o
C Haman
o
Fi
x
me
r
ge-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio
C Hama
n
o
Merge branch 'jb/gc'
commit
|
commitdiff
|
tree
2007-03-19
J
unio C Hamano
M
e
rge bra
n
ch 'fl/cvs
s
erv
e
r
'
commit
|
commitdiff
|
tree
2007-03-19
Juni
o
C Haman
o
M
erge br
a
nc
h
'sp/run-command'
commit
|
commitdiff
|
tree
2007-03-18
J
u
n
i
o C Hamano
U
p
da
t
e main gi
t
.
h
tml
p
age to po
i
nt at 1
.
5
.
0
.
5 docume
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
J
unio C Ham
a
no
Merge
b
ranch 'ar/d
i
f
f
'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Hamano
Mer
g
e 1
.
5
.
0
.
5 in from 'maint'
commit
|
commitdiff
|
tree
2007-03-18
Junio
C Hamano
GIT
1
.
5
.
0
.
5
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
Junio C
H
aman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-03-17
J
unio
C
H
amano
a
p
plymbox: brown paper bag
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Ju
n
io C Hamano
git-log --first
-
p
a
rent
:
show only the first paren
t
log
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C
H
a
mano
try
-
to-simplify-c
o
mmit
:
use diff-tree --quiet
mach
i
n
er
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
u
nio C Haman
o
revision
.
c: explain what
t
r
ee_diffe
r
ence does
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Te
a
ch --quiet t
o
diff
b
ack
e
nds
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C
H
aman
o
diff --qu
i
et
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
u
n
io C H
a
m
a
no
Re
m
ove unused diff
c
ore
_
std_n
o
_resolve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C
Hamano
Merge
GIT 1
.
5
.
0
.
4
commit
|
commitdiff
|
tree
2007-03-14
Junio
C
Hamano
GIT
1
.
5
.
0
.
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
gi
t
-
checkout: fix
"
e
val" us
e
d for merg
e
l
abelling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merge branc
h
'jc/repack'
commit
|
commitdiff
|
tree
2007-03-14
Jun
i
o C Hamano
Merge bran
c
h 'jc/fetch'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
M
erge branc
h
'dz/ma
i
l
in
f
o'
commit
|
commitdiff
|
tree
2007-03-14
J
unio C Ha
m
ano
Merge branch 'jb/per-user-excl
u
de'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Me
r
ge br
a
n
c
h
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-14
Junio C H
a
mano
M
e
rge branch 'p
b
/
b
r
anch-t
r
ack'
commit
|
commitdiff
|
tree
2007-03-14
Juni
o
C Hamano
s
hortlog: pro
m
p
t
when reading from te
r
minal by mistake
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Doc
u
mentation: add git-mergetool t
o
the comman
d
li
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C H
a
mano
M
e
rge branch 'master
'
o
f
git://
r
epo
.
or
.
cz/git/merget
o
o
l
commit
|
commitdiff
|
tree
2007-03-13
J
u
nio
C
Hama
n
o
M
erge br
a
nc
h
'ma
s
te
r
'
of git://repo
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2007-03-13
Juni
o
C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-03-13
Junio C Ha
m
a
n
o
Merge branch 'maste
r
'
o
f gi
t
:/
/
r
epo
.
or
.
c
z
/git/fastimport
commit
|
commitdiff
|
tree
2007-03-13
Juni
o
C Hama
n
o
Merg
e
bra
n
c
h
'maint' of
g
it://repo
.
or
.
cz
/
git
/
fastimp
o
rt
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio
C
Hama
n
o
Merge b
r
anch 'm
a
in
t
' of g
i
t:/
/
repo
.
or
.
cz/git-gui
int
o
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C H
a
man
o
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-03-12
Junio C Hamano
Merge
bra
n
ch 'jc/bound
a
ry'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
pr
e
par
e
_packed_
g
it()
:
sort pac
k
s b
y
ag
e
a
n
d localn
e
ss
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Jun
i
o C Hamano
Fix br
o
k
en crea
t
e_branch() in builtin-branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
M
er
g
e bran
c
h 'js/attach'
commit
|
commitdiff
|
tree
2007-03-11
Junio C
Hamano
Merge b
r
anch 'js/diff-ni'
commit
|
commitdiff
|
tree
2007-03-11
Jun
i
o C Ha
m
ano
Mer
g
e
b
r
a
n
ch '
j
c
/
fsck'
commit
|
commitdiff
|
tree
2007-03-11
J
unio C
Hamano
M
erge branch 'pb
/
co
m
mit-i
'
commit
|
commitdiff
|
tree
2007-03-11
Juni
o
C
H
amano
Mer
g
e
b
r
anch 'js/rev
e
rt-che
r
ry'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge branch 's
p
/make'
commit
|
commitdiff
|
tree
2007-03-11
Jun
i
o C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-11
Juni
o
C Hamano
Merge branch 'maint' of gi
t
://linux
-
n
f
s
.
org/
~
bfiel
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-08
J
u
ni
o
C
H
am
a
no
Merge b
r
an
c
h 'js/config-
r
ename'
commit
|
commitdiff
|
tree
2007-03-08
Ju
n
io
C Hamano
Merge bran
c
h 'mast
e
r' of git://r
e
po
.
or
.
cz/git
/
f
asti
m
port
commit
|
commitdiff
|
tree
2007-03-07
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-03-06
Jun
i
o C
Ha
m
ano
re
v
isi
o
n --boundary:
f
ix uncounte
d
c
a
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
r
evi
s
ion
--boundary:
f
i
x stupid typ
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
git-bundle: ma
k
e
v
erify a bit more
c
h
a
t
t
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Jun
i
o
C
Hama
n
o
revision traversa
l
: SHOWN me
a
ns
sho
w
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
gi
t
-b
u
ndl
e
: vario
u
s fi
x
ups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
i
o
C H
a
mano
r
evision t
r
aversal: re
t
i
re BOUNDARY_SHOW
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
J
u
nio C Hamano
re
v
isi
o
n
walker: F
i
x --b
o
undary when limited
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio
C Ha
m
ano
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-06
J
unio C Ham
a
no
Mer
g
e
bran
c
h 'maste
r
' o
f
git://repo
.
or
.
cz/git-gui
into
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
io C Hamano
git-bundle: fix pack ge
n
e
r
atio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C
H
a
mano
Merge bran
c
h 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
gi
t
-commit: cd
t
o top before showi
n
g the final sta
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
J
u
nio C H
a
mano
Merge branch '
m
ast
e
r-f
o
r-
j
u
nio' of
g
it://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge branch 'maint-for-junio' o
f
git://repo
.
or
.
c
z
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
fsc
k
: exit with non-zero
s
tat
u
s upon error
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio
C Ha
m
a
no
unpack_sha1_file(): detect corrupt l
o
ose object files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next