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 Hamano
c
heck
o
u
t -m
:
r
e
c
r
e
at
e
merge when checki
n
g out of unme
r
ged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
no
Mer
g
e
b
ranch 'jc/maint-checkout-fix'
into 'jc/bet
t
er
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gi
t
-merg
e
-re
c
ursive: lear
n
to honor merge
.
conf
l
icts
t
yle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
no
me
r
ge
.
con
f
licts
t
y
le
:
choose between "merge" and
"
di
f
f
3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
r
erere: understand "diff3 -m" style conflicts wit
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
ano
r
erere
.
c: u
s
e sy
m
bolic constants
t
o k
e
ep track o
f
parsing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
J
uni
o
C H
a
mano
xmerge
.
c:
"
d
i
ff3 -m"
s
tyle clips me
r
ge reducti
o
n leve
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
no
xmerge
.
c: minimum
r
eadability fixu
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
xdiff-merge: optionally show conflicts in "diff3
-
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hamano
xdl_fill
_
merge_b
u
ffer
(
): separat
e
out a
t
oo
deeply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
ama
n
o
check
o
ut -
-
ours/--theirs: al
l
ow checki
n
g o
u
t one side
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
checkout -f: allow ignoring u
n
m
e
rged p
a
ths
w
hen checking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Ha
m
ano
checkout: do
not
che
c
k out unmerged higher stag
e
s randomly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
ctype
.
c: protect ti
n
y C preprocessor cons
t
an
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o
C
Hamano
GI
T
1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
i
o
C Hama
n
o
Merge
b
ranch 'ag/m
a
int-combine-d
i
ff
-
fix
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
M
er
g
e branch 'mv/maint
-
me
r
g
e
-
f
i
x
'
i
nto m
a
in
t
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C
H
amano
merge: fix numerus bugs
around "tri
v
ial merg
e
"
a
r
e
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
ano
un
p
ack_trees(): pro
t
ect the handcrafted in-core inde
x
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hama
n
o
Update draft rele
a
se n
o
tes for
1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
i
o C Hamano
"git-merge":
a
llow f
a
st-forwarding in
a
s
t
a
t-dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
completion
:
find o
u
t supp
o
rted
merge strategie
s
correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Ha
m
ano
for-each-ref: cope with tags with incom
p
lete
l
ines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
diff --check: do not get confused by new blank
lines
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Start 1
.
6
.
0
.
X mainte
n
an
c
e series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
H
a
m
a
no
G
I
T 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge
g
it-gui 0
.
1
1
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge b
r
anch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Me
r
g
e
git://git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-14
Ju
n
io C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-13
J
unio C Ha
m
ano
GIT
1
.
6
.
0-rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio
C
H
a
m
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-13
J
u
nio C Hamano
Do not
t
alk about
"
d
iff"
i
n
rev-list documentation
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
J
u
nio C Hamano
Merge git://git
.
b
o
gomips
.
org/git-svn
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
diff --
c
h
e
ck: do not uncondi
t
ionall
y
co
m
p
l
a
in about
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Jun
i
o C
Ha
m
ano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Re-fix r
e
v-list
-
o
p
tions doc
u
mentat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
J
unio C Hamano
Merge
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-11
Junio C
H
amano
Fix
de
l
e
t
in
g
reflog entri
e
s from HEA
D
reflog
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hama
n
o
U
p
date draft RelN
o
tes
for
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-09
Junio C
H
amano
maili
n
fo
:
fi
x
MIME multi-part mes
s
age bound
a
ry hand
l
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Ham
a
no
GIT-
V
ERS
I
ON-GEN: mar
k
the version '
d
irty' only if there
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Hamano
a
s
c
i
ido
c
m
a
rkup fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-07
Junio C Ham
a
no
M
erge bra
n
ch 'lt/config-
f
s
ync' into m
a
int
commit
|
commitdiff
|
tree
2008-08-07
Juni
o
C Hamano
Merge bran
c
h 'jc/reflog-expire
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2008-08-07
J
u
nio C Hamano
Merge branch 'ag/rewrite_on
e
' into maint
commit
|
commitdiff
|
tree
2008-08-06
Junio C Ham
a
no
G
I
T 1
.
6
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Ha
m
ano
Sync wit
h
1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
J
u
ni
o
C H
a
mano
GIT 1
.
5
.
6
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Ju
n
io C Hamano
File
s
giv
e
n on
th
e
command line
are relative to $c
w
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C
H
amano
Merge git
:
//
r
e
po
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hama
n
o
Me
r
ge git
:
/
/
git
.
kernel
.
o
r
g
/
p
ub/
s
cm/git
k
/git
k
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Merge branch 'rs/arc
h
ive-parse-options'
commit
|
commitdiff
|
tree
2008-08-06
Junio C Haman
o
fix diff-t
r
ee --s
t
d
in docum
e
nt
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Juni
o
C H
a
mano
Mer
g
e
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-06
Jun
i
o
C
Hama
n
o
RelNotes
1
.
5
.
6
.
5 updates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-03
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-08-02
Juni
o
C
Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
Junio C Ham
a
n
o
builtin
-
name-rev
.
c
:
spl
i
t
d
eeply nes
t
ed par
t
f
rom
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-02
J
u
nio
C
Ha
m
a
n
o
Star
t
1
.
5
.
6
.
5 RelNot
e
s to
describe accumulated fi
x
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
J
u
n
i
o
C
Hamano
Update my e-
m
ail address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
J
u
nio C Hamano
D
ocumentat
i
on: clar
i
f
y
di
f
f --cc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio
C
Hamano
make sure parsed wildcard
refspec ends with slash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-31
Ju
n
io
C Hamano
T
e
ach --find-copies-harder to "git
b
lam
e
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Jun
i
o C Hamano
F
i
x test-pa
r
se-options "i
n
teger" test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Ju
n
io C Ham
a
no
Fix merge nam
e
ge
n
e
ration
i
n "m
e
rge
in C"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio
C
H
a
m
ano
Merge git://re
p
o
.
or
.
c
z
/git
-
gui
commit
|
commitdiff
|
tree
2008-07-30
J
unio C Haman
o
Tea
c
h
git
l
inks to ie_modified() and
c
e_modif
i
ed_check_fs()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Ha
m
a
n
o
t7001: fix "git mv" test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
Doc
u
mentation: clarif
y
what is shown in "git-ls
-
f
i
l
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Ju
n
i
o C Hamano
ls-tree doc
u
ment
a
ti
o
n: enhance notes on su
b
d
i
rect
o
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hama
n
o
Allow
i
nstalling in the tr
a
ditio
n
a
l
way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Ham
a
no
Allow
bu
i
lding without an
y
git
install
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
J
uni
o
C
H
amano
GIT 1
.
6
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
mak
e
sure parsed wi
l
dcard refspec ends
with sl
a
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
J
u
nio C
Hama
n
o
Mer
g
e git://repo
.
o
r
.
c
z
/g
i
t-gu
i
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Documentation: clarify
how to di
s
able elements in
c
ore
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Haman
o
Makefile
:
fix shell
quoting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Jun
i
o
C Haman
o
tests: propagate $(T
A
R
)
down
f
rom the toplevel M
a
kefile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Ju
n
io C
Hamano
Merge branch 'ph/
c
hec
k
out'
commit
|
commitdiff
|
tree
2008-07-24
Junio C H
a
man
o
M
erge bra
n
ch 'maint
'
into p
h
/checkout
commit
|
commitdiff
|
tree
2008-07-24
J
u
nio C H
a
mano
igno
r
e
n
o
n-e
x
istent refs in dw
i
m_log
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Ju
n
io
C
Hamano
Documentati
o
n
:
cl
a
rify d
i
ff
-
-
cc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Ju
n
io C
H
amano
builtin
-
branch
.
c: optimize --merged and -
-
no
-
merged
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Jun
i
o C H
a
mano
bui
l
tin
-
b
r
anch
.
c: remove unuse
d
code i
n
app
e
n
d
_ref
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
st
a
sh save: fix
par
a
meter h
a
n
d
ling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Juni
o
C
Ham
a
no
t
e
st
s
:
do not re
l
y on external
"
p
atch"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Junio C
H
amano
R
e
ve
r
t
"
make git-
s
tatus use a page
r
"
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ha
m
ano
Update
m
y e-mail
a
ddress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio
C Hamano
Merge br
a
nch 'ap/trackinfo'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ham
a
n
o
M
e
rge br
a
nch 'jc/re
r
e
r
e-auto-more'
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C Hamano
M
erge bran
c
h 'ns/am-abort'
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C Hamano
Merge branch 'jc/ad
d
-addremove'
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o C Hamano
"nee
d
s update" considered
harmful
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io
C
Haman
o
Move read_in_full() and
wr
i
te_i
n
_full() to wrapper
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
L
i
nk shell with
compat laye
r
functi
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next