repo.or.cz
/
git
/
haiku.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
checkout -m: recreate merge when checking out of unmerged index
2008-08-31
Junio C
Hama
n
o
c
h
eckout
-m: recreate me
r
ge when checking
o
u
t
of
unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C Hamano
Me
r
ge b
r
a
n
ch 'jc/maint-checkout-fix'
i
nt
o
'jc/better
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
H
amano
git-merge-recursiv
e
: learn to
h
onor mer
g
e
.
conflictstyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C H
a
mano
merge
.
conflictstyle:
ch
o
os
e
between "
m
er
g
e" and "diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
rer
e
re
:
under
s
tand "dif
f
3 -m" s
t
yle
c
onflicts with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
rer
e
re
.
c: use
s
y
m
bolic constants to k
e
ep
t
r
ack of parsing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xmerge
.
c: "diff3
-m" sty
l
e clips merge reduct
i
o
n level
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Hamano
x
m
erge
.
c: minimum readabil
i
ty
fixup
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
xdiff-merg
e
: option
a
lly show conflicts
in "diff3 -m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xd
l
_f
i
ll_merge_buffer(
)
:
separa
t
e
out
a
t
o
o deeply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
no
checkout --ours/--theirs
:
all
o
w checking out one sid
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C Hamano
check
o
u
t
-f: allow ignoring
u
nmerged
p
aths when che
c
k
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o
C
Hamano
checkout: do not check out unmerg
e
d
h
igher stages rand
o
m
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Ha
m
ano
ctype
.
c: protect
ti
n
y C preprocessor con
s
tants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
Merge branch 'ag/
m
aint-c
o
mbine-di
f
f-fi
x
' into
maint
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
Merge branch
'mv
/
maint-m
e
rge
-
f
i
x' into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
mer
g
e:
f
ix numerus bugs around "tri
v
ial merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio
C
Ha
m
ano
unpack_trees
(
):
p
rotect the ha
n
d
c
rafted i
n
-
c
o
r
e index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
a
m
ano
Update draft rel
e
ase n
o
tes
for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
"
g
it-merge": a
l
low fa
s
t-
f
orwar
d
ing in a stat-di
r
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
H
amano
completio
n
: find out su
p
p
orted merge strategies corre
c
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Haman
o
for-ea
c
h-r
e
f:
cope
w
ith tags with incompl
e
te lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
diff --check: do not ge
t
co
n
fused by new blank lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hama
n
o
Start 1
.
6
.
0
.
X mai
n
tenanc
e
series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C H
a
mano
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Hamano
Merge
git-
g
ui
0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ha
m
ano
Merge branch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
M
e
r
g
e g
i
t://git
.
k
ernel
.
org/pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2008-08-14
Juni
o
C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-13
Juni
o
C Hamano
GIT 1
.
6
.
0
-
rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Ham
a
no
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-13
J
u
n
i
o C
H
a
man
o
Do
n
ot talk a
b
ou
t
"diff" in rev-list doc
u
mentation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
J
unio C Hamano
Merge gi
t
:/
/
git
.
bo
g
omips
.
org/git
-
svn
commit
|
commitdiff
|
tree
2008-08-12
Junio C H
a
m
a
no
dif
f
--check: do not uncondition
a
lly
c
omplain about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
J
u
nio
C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C H
a
mano
R
e
-fi
x
rev-list-o
p
tion
s
documen
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Juni
o
C Hamano
F
i
x
deleting re
f
l
og entries
from HEAD
ref
l
og
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio
C Hamano
U
p
date draft RelNotes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Ham
a
no
Merge
b
ra
n
ch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hamano
mailinfo: fix MIME m
u
lti-part mess
a
g
e
boundary handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Jun
i
o C Hamano
GIT-VERSION-GEN: mark t
h
e version '
d
ir
t
y' on
l
y if
t
h
ere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
J
unio C Hamano
asciidoc markup
fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-07
Junio C
H
amano
M
e
rge br
a
nch 'lt
/
co
n
fig-fsync' into
m
aint
commit
|
commitdiff
|
tree
2008-08-07
J
u
nio C Ham
a
n
o
Merg
e
b
r
a
nch
'jc/reflog-expire'
into
m
aint
commit
|
commitdiff
|
tree
2008-08-07
Junio C Hamano
Merge b
r
anch 'ag/rewrite_o
n
e'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2008-08-06
J
unio C Ha
m
ano
GIT 1
.
6
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
S
y
n
c
with 1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
Ju
n
io C Hamano
GIT 1
.
5
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
J
u
nio C Hama
n
o
F
iles
given on
the c
o
mmand line are relat
i
ve
to $cwd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio
C Hamano
Merge
git
:
//r
e
po
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-08-06
Junio C Ha
m
ano
M
e
rge
g
it:/
/
git
.
kern
e
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-06
Jun
i
o C Ham
a
no
Mer
g
e branch 'rs/
a
rchive-parse-options'
commit
|
commitdiff
|
tree
2008-08-06
Ju
n
io C H
a
ma
n
o
fix diff-tree -
-
stdin
do
c
u
mentat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
J
unio C
H
a
m
ano
Merg
e
b
r
anch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hama
n
o
RelNotes 1
.
5
.
6
.
5 u
p
dat
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-03
Ju
n
i
o
C Hamano
Merge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-02
Junio C Ham
a
no
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
Ju
n
io
C Hamano
built
i
n-n
a
me-rev
.
c:
split dee
p
ly nested part from the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Ham
a
no
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
S
tart 1
.
5
.
6
.
5 RelNotes to describe accumulate
d
fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio
C
Hama
n
o
Upd
a
te my
e
-mail address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Ju
n
io C Hamano
Documentation: clarify diff --cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Ham
a
no
make sure
p
ar
s
ed wildcard
r
efs
p
ec ends with slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-31
Juni
o
C Hamano
Teach --find
-
cop
i
es-
h
arder to "git blame"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
J
unio C Hamano
Fix tes
t
-parse-op
t
ions "
i
nteger" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio
C Ha
m
ano
Fix m
e
r
g
e
name generatio
n
i
n
"merge in C"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
J
u
n
i
o
C Hamano
M
e
r
g
e
g
i
t://repo
.
or
.
cz/
g
i
t
-
g
ui
commit
|
commitdiff
|
tree
2008-07-30
Ju
n
io
C
Ham
a
n
o
T
e
a
c
h gi
t
links to
ie_mo
d
i
fied() and ce
_
modi
f
ied_
c
heck_f
s
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio
C
H
a
m
a
no
t7001: fi
x
"git mv"
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C H
a
man
o
Docum
e
ntation:
clarify
w
hat is shown in
"
git-ls-files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Haman
o
ls
-
t
r
ee documentation
:
enhance notes on subdirectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
J
unio C Hamano
Al
l
ow installin
g
in
the tradit
i
o
n
a
l
way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
J
u
nio C Hamano
A
l
low building without an
y
g
i
t
in
s
talled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Juni
o
C Hamano
G
I
T 1
.
6
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C
Hamano
make sure parsed wildcard refs
p
ec ends with
s
lash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Ju
n
i
o
C Hamano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hama
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Do
c
umentation
:
clarify
h
ow to
d
isab
l
e
elements i
n
core
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
J
unio C H
a
m
ano
Makef
i
l
e
: fi
x
shell quotin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
J
u
nio C Haman
o
tests: propagate $(TAR) down from the toplevel Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Merge bran
c
h 'ph/
c
heckout
'
commit
|
commitdiff
|
tree
2008-07-24
Junio C Hamano
M
erge
branch
'maint' into ph/checkout
commit
|
commitdiff
|
tree
2008-07-24
J
unio
C Hamano
igno
r
e non-e
x
iste
n
t refs in dwim_
l
og(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
D
o
c
umentation: clarify diff
--cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
unio C Hamano
bu
i
ltin-br
a
nch
.
c:
optimize --
m
erge
d
an
d
--no-merged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
u
nio C Hamano
builtin-branch
.
c: remove unused
c
ode
i
n
append_ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio
C
Hamano
sta
s
h
save: fix parameter
ha
n
dling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Hamano
test
s
: d
o
not rely on external "patch
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
J
un
i
o C
Hamano
Revert "make
g
it-status use a page
r
"
commit
|
commitdiff
|
tree
2008-07-21
Junio
C
Ham
a
no
Update my e-mail address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hama
n
o
Merge branch 'ap/track
i
nfo'
commit
|
commitdiff
|
tree
2008-07-21
J
u
n
io
C
Ham
a
no
Merge bran
c
h
'
jc/rerere-au
t
o-mor
e
'
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io C
H
a
m
a
no
M
erge
branc
h
'ns/am-abort'
commit
|
commitdiff
|
tree
2008-07-21
J
u
nio C Hamano
Merge bra
n
ch 'jc/add-addremove'
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o C Haman
o
"nee
d
s update" consid
e
r
ed harmful
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Move read_in_fu
l
l()
and wri
t
e_
i
n_fu
l
l() to wrapper
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C
Hamano
Link shell with compat la
y
e
r
f
u
n
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next