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
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-04-04
Junio C Hama
n
o
Fix twowa
y
_me
r
ge that passed d
/
f co
n
flict mark
e
r
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Haman
o
Fix read-tr
e
e --
p
r
e
fix=di
r
/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
unpack-tre
e
s: get
r
i
d
of *indpos par
a
meter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
unpack_trees
.
c: pass
u
npac
k
_trees_options structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
add_cache_entry():
r
emo
v
al o
f
file foo do
e
s n
o
t
conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C Haman
o
M
erge branch '
j
c/bise
c
t
'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Haman
o
Mer
g
e b
r
an
c
h 'fl/doc
'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge bran
c
h
'post
1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch
'
post1
.
5
.
1/tc
l
tk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
b
ranch
'
post
1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
a
no
Me
r
ge br
a
n
ch 'l
t
/
dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
amano
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Mer
g
e 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GI
T
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
r
e
rere shou
l
d n
o
t repeat the
earlier hunks in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
J
u
n
i
o C Hamano
H
opef
u
lly fina
l
updat
e
to
t
he draft Release Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Ham
a
n
o
Optional Tck/Tk: ignore generate
d
file
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Hamano
Do not bother docume
n
t
i
ng fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Hama
n
o
Update
d
raft rele
a
se n
o
tes fo
r
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C
Hamano
Me
r
ge bran
c
h 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
Merge bra
n
ch 'maste
r
' of git:/
/
r
e
p
o
.
or
.
cz/git/mer
g
eto
o
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Documentation: unbreak user-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
m
ano
GIT 1
.
5
.
1-rc
3
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Ham
a
no
Up
d
ate main
git
.
html page to po
i
nt at 1
.
5
.
0
.
6 docu
m
enta
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Hamano
Merge bran
c
h '
m
aint' to synch
r
oni
z
e wit
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Hamano
Fix
"
--pr
e
tty=format:" fo
r
p
arent re
l
ated
i
t
e
ms
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hama
n
o
git-commit: "read-t
r
ee -m HE
A
D" is
n
o
t
th
e
righ
t
way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
u
n
io C Hamano
sha1_file
.
c (write_sh
a
1_file):
Detect clos
e
failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
Ha
m
ano
Document git-log --fir
s
t-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
Jun
i
o
C
Ha
m
ano
Merge branch 'jc/
f
pl'
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o
C
Hamano
Upd
a
te README to p
o
in
t
at a few key
p
eriodical messag
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ham
a
n
o
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C Hamano
Merge
branch 'maint' of
g
it://linux-
n
f
s
.
o
r
g/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ha
m
a
no
Mer
g
e br
a
nch 'js/remote-show-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
Ham
a
no
Mer
g
e b
r
an
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-03-24
J
u
nio
C Hamano
git
-
am docume
n
tation:
d
escribe what is t
a
ken from where
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Juni
o
C Hamano
m
a
ke the p
r
evious optimization work also on path-limited
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
J
u
nio C
H
ama
n
o
rev-list
--bisect:
Fix "halfway" optimization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
J
u
ni
o
C Hamano
Me
r
ge branch 'mas
t
er'
i
n
t
o jc/bisect
commit
|
commitdiff
|
tree
2007-03-24
Juni
o
C
Hama
n
o
M
e
rge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ham
a
n
o
Fix path-limited "rev-li
s
t --bis
e
ct" termination con
d
i
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
g
i
t-bisect
.
sh:
p
rope
r
ly dq $GIT
_
DIR
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
g
i
t
-bisec
t
: t
y
pofix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Ju
n
io C Hamano
c
h
eckou
t
: report whe
r
e t
h
e new
H
EAD is upon detac
h
in
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
t6
0
04: ad
d
a bit more pa
t
h optimi
z
ation tes
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
J
unio C
Hamano
git-apply: Do not free the wro
n
g buffer when
we co
n
vert
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Haman
o
M
erg
e
git://g
i
t2
.
ker
n
el
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Me
r
ge
b
ran
c
h '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
git-rebase: make
'rebase
H
EAD bra
n
c
h
' work as expec
t
ed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git-rev-
l
i
s
t --bise
c
t:
o
p
t
imiz
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
J
un
i
o C
H
amano
git-
r
ev-list: add --bis
e
ct-v
a
rs
option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
Hamano
t6002:
m
i
nor sp
e
lling fi
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Hamano
t
r
ee_entry_interesting()
:
all
o
w it to say "e
v
eryt
h
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C
H
aman
o
tree-diff: avoid st
r
ncmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
J
unio C Hamano
Teach tree
_
e
n
try_intere
s
t
ing() that t
h
e tree e
n
tri
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Junio C H
a
man
o
bl
a
me: cmp_
s
uspe
c
t
is not "cmp" anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-20
Ju
n
io C Hamano
Mer
g
e g
i
t://git2
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-20
Junio C H
a
mano
blame:
micro
-
o
p
timize c
m
p_suspect()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Haman
o
GIT 1
.
5
.
1-rc1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
Ju
n
io C Hama
n
o
Fix merge-index
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
Jun
i
o C Hamano
Merge branch 'jb
/
g
c
'
commit
|
commitdiff
|
tree
2007-03-19
J
uni
o
C Hamano
M
erge
b
r
a
nch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-03-19
Jun
i
o C
H
amano
Merge branch
'sp/run-comm
a
nd'
commit
|
commitdiff
|
tree
2007-03-18
J
unio C
Hama
n
o
Update
m
a
in git
.
html page
t
o p
o
i
n
t
at 1
.
5
.
0
.
5
docu
m
en
t
a
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-18
Ju
n
io C Hamano
Me
r
ge branch 'ar/di
f
f'
commit
|
commitdiff
|
tree
2007-03-18
J
unio C Hamano
Merge 1
.
5
.
0
.
5 in from '
m
aint'
commit
|
commitdiff
|
tree
2007-03-18
Jun
i
o
C H
a
mano
GIT 1
.
5
.
0
.
5
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-17
Junio C H
a
m
a
no
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2007-03-17
J
unio C
Hamano
a
p
plymbox: brown
pape
r
bag fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Ju
n
io C Hamano
g
i
t-log --
f
irst-
p
arent: show o
n
l
y th
e
f
irst
pare
n
t log
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Junio
C Hamano
try
-
to-si
m
plify-co
m
mit: use diff-tree --quiet machinery
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Junio
C
Hamano
revision
.
c: expla
i
n wha
t
tree_difference
d
oes
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Teach --quiet
to d
i
ff backe
n
ds
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
diff --quiet
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Remove unused d
i
ffcore_std_no_resolve
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Jun
i
o
C Ham
a
no
Merge
GIT 1
.
5
.
0
.
4
commit
|
commitdiff
|
tree
2007-03-14
J
unio C Ha
m
ano
GIT 1
.
5
.
0
.
4
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Ju
n
io C Hama
n
o
gi
t
-checkout: fix
"
eval"
use
d
f
or
merge labelling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
J
u
nio
C
Hamano
Merge branch
'
jc/repack'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
M
erge bran
c
h 'jc
/
fetch'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merge branch 'dz/mailinfo'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Mer
g
e bran
c
h
'jb/per-us
e
r-exclude
'
commit
|
commitdiff
|
tree
2007-03-14
Junio C
H
am
a
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-14
Juni
o
C Hamano
Merge branch 'pb/branch-t
r
ack'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hama
n
o
shor
t
log
:
p
r
ompt when
r
ea
d
ing from te
r
m
i
nal by mis
t
ake
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
J
unio
C
Hamano
Document
a
t
i
o
n: add g
i
t-merget
o
ol to t
h
e command lis
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Jun
i
o C
H
aman
o
Merge
branch 'mast
e
r' of git://repo
.
o
r
.
c
z/git/merg
e
tool
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Merg
e
branch
'
master' of git://rep
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Mer
g
e branch
'maint'
commit
|
commitdiff
|
tree
2007-03-13
Junio
C
Hamano
Merge
branch 'ma
s
ter' of
git://repo
.
or
.
cz/
g
it/fastimport
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Mer
g
e branch 'maint' of
git://repo
.
or
.
cz/git
/
fastim
p
ort
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C Ha
m
a
n
o
Merge branch 'maint' of git://
r
epo
.
or
.
cz/git-gui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
J
unio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-12
Junio C Hamano
Merge
b
ranch
'jc/bounda
r
y'
commit
|
commitdiff
|
tree
2007-03-11
Ju
n
io C Ha
m
ano
prepa
r
e_packed_git(): sort packs by age and localness
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-11
J
u
n
i
o
C
Hamano
Fix brok
e
n create_branch
(
) in
b
uiltin-branc
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-11
Junio C
H
ama
n
o
Merg
e
branch 'js/attach'
commit
|
commitdiff
|
tree
2007-03-11
Junio
C Hamano
M
e
rge b
r
a
nch 'js/diff-ni
'
commit
|
commitdiff
|
tree
next