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
Merge branch 'cj/maint-gitpm-fix-maybe-self'
2008-09-10
Junio C
Hamano
che
c
kout: do not
lose staged removal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
J
unio C Hamano
F
i
x p
e
rmission bits
o
n
sources
checked
ou
t
with an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C
Hamano
push: receiver e
n
d advertises re
f
s from alte
r
nate repos
i
to
r
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C
H
amano
pus
h
:
p
repare sender to
receiv
e
extended r
e
f information
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C Hamano
receive-pa
c
k: mak
e
it a builtin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C Hamano
is_directory(): a generic help
e
r
f
unction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-08
Ju
n
io
C
Hamano
Merge git
:
//git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2008-09-08
Junio C
Haman
o
M
erge b
r
an
c
h 'ar/autospel
l
'
commit
|
commitdiff
|
tree
2008-09-08
J
unio C Hamano
M
e
rge branc
h
'jc/cc-ld-dynpath'
commit
|
commitdiff
|
tree
2008-09-08
Junio C Hamano
Merge branch 'jc/hi
d
e-cr-in-diff-from
-
less
'
commit
|
commitdiff
|
tree
2008-09-08
Junio
C Ha
m
ano
Merge branch 'jc/m
a
int-check
o
ut
-
fix'
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hamano
Don
'
t
v
erify hos
t
n
a
me in SSL certs
when GIT_SSL_NO_V
E
R
I
F
Y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Ju
n
io C Hamano
daemon
.
c: avoid
s
etlinebuf()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hamano
U
pdate draft r
e
lease
n
o
te
s
for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Junio C
H
amano
Mer
g
e git://git
.
bogomips
.
org/g
i
t-
s
vn
commit
|
commitdiff
|
tree
2008-09-07
J
u
nio C Hamano
dif
f
--quiet
:
make it synonym to
-
-
e
xit-code >/dev
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Junio C
Hamano
diff Porcelai
n
:
d
o not disable
a
u
to index
refreshi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hamano
git-apply:--in
c
lude=paths
p
ec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Juni
o
C Ha
m
ano
Merge upda
t
ed git-gui and g
i
tk tha
t
call each other
commit
|
commitdiff
|
tree
2008-09-06
Junio C Ham
a
no
M
e
rge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-09-06
Jun
i
o C Hamano
Update
d
raft release no
t
e
s for 1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-06
J
u
nio C Hamano
sta
s
h: refresh the in
d
ex before
decid
i
ng if the work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-06
Junio C Haman
o
Merge branch 'maint' of
git:
/
/repo
.
or
.
cz/git-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Junio C Ha
m
ano
M
ention
t
he
f
act that 'git annotat
e
' i
s
o
nly fo
r
backwar
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Junio C Hamano
"blame -c" should be compatible with "anno
t
ate"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Ju
n
io
C
Hamano
Mer
g
e branch 'j
c
/maint-log-gr
e
p'
commit
|
commitdiff
|
tree
2008-09-05
Junio C Hamano
log --aut
h
or/--committer: really m
a
tch
only with name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Junio C Ham
a
no
diff --cu
m
u
la
t
ive
is a s
u
b
-op
t
ion of --dirstat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Junio C Hamano
saf
e
_create_lea
d
ing
_
directories(
)
:
m
a
ke it about
"le
a
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
J
u
nio C Hamano
Update dra
f
t release not
e
s for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Jun
i
o C Hamano
M
e
rge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Start 1
.
6
.
0
.
2 maint
e
nanc
e
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
i
o C
Hamano
Merg
e
b
r
anch
'
nd/
w
orktree' into ma
i
n
t
commit
|
commitdiff
|
tree
2008-09-03
J
un
i
o
C Hamano
Me
r
ge branch 'ho/
d
ashless' into maint
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merg
e
branch 'tr/filter-b
r
anch'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Ha
m
ano
Merge branch 'np/maint-s
a
fer-pac
k
'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C
Hamano
Merge bran
c
h 'r
f
/man-env'
commit
|
commitdiff
|
tree
2008-09-03
J
u
nio
C
Hamano
Me
r
ge
branc
h
'jc/au
t
h
o
r-nickname'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merg
e
branch 'dp/pi
d
-uintmax'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merg
e
b
ranch
'np/maint-safer-pack' into np/pack
commit
|
commitdiff
|
tree
2008-09-01
Junio C
H
amano
git-merge do
c
umentation: de
s
cribe how confl
i
ct is presented
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Junio C H
a
mano
c
heckout --
c
onflict=<style>: re
c
rea
t
e mer
g
e in a no
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hamano
Merge b
r
a
nc
h
'
t
r/rev-l
i
st-docs' into tr/
f
ilter-branch
commit
|
commitdiff
|
tree
2008-08-31
J
unio
C Haman
o
M
e
rge branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
ama
n
o
git-add --intent-to-add
(-
N
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
ano
'g
i
t
f
oo' program identi
f
ies i
t
self wit
h
out da
s
h
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gi
t
commit
--author=$na
m
e: loo
k
$nam
e
up i
n
e
x
is
t
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hamano
diff: v
a
r
y
default
prefix depending on what are
compared
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Haman
o
diff: H
e
lp "less" h
i
de ^M
f
rom the output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
n
io C
Hamano
Merge
b
r
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
gitat
t
ributes
:
-crlf is not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
i
o
C
Hamano
check
o
ut -m: recrea
t
e me
r
g
e when
c
hecking out of
u
nmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C H
a
mano
Merge branch 'jc/maint
-
c
h
eckout-fix' i
n
to 'jc/bette
r
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
Junio
C Ham
a
n
o
git-m
e
rge-recursive: learn to honor me
r
ge
.
conflictst
y
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
no
merge
.
conflic
t
style: cho
o
se between "merge" and "diff
3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
amano
rerere:
u
n
derstand "diff3
-
m" sty
l
e con
f
licts with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
rere
r
e
.
c: use symboli
c
consta
n
ts to
k
e
e
p track o
f
par
s
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
H
a
m
a
n
o
xmerge
.
c: "diff3 -
m
" style clip
s
merge re
d
uction
le
v
e
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
amano
xmerge
.
c: minimum readab
i
lity fixups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xdiff-merge: op
t
ionally sh
o
w confli
c
t
s
i
n "
d
if
f
3
-m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Ha
m
ano
xdl_fil
l
_merge_buffer():
separate out a too
deeply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C Hama
n
o
checkout --ours/-
-
th
e
irs: allow checking out one side
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Hamano
checkout -f
:
allow i
g
noring
unmerged p
a
ths
w
hen chec
k
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
checkout:
do not check out unmerged higher stages randomly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Ha
m
ano
Merge bran
c
h 'jc/post-
s
impli
f
y'
(ear
l
y
part) into tr
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C Ha
m
ano
git-apply: Loo
s
en "match_beg
i
nning" log
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Fix
e
xample in git
-
name-rev docu
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Hamano
Merge
bran
c
h 'sp/missing-t
h
in-
b
a
s
e' into maint
commit
|
commitdiff
|
tree
2008-08-30
J
un
i
o C Hamano
M
e
rge branch 's
b
/
daemon
'
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o
C
Hamano
M
erge branch 'a
f
/mai
n
t-install
-
no-handlink' i
n
to m
a
int
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Ha
m
ano
shell
:
do not play duplicat
e
d definition ga
m
es to shri
n
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Me
r
g
e
branch '
n
p/verify-pack' i
n
to main
t
commit
|
commitdiff
|
tree
2008-08-29
J
u
nio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-28
J
u
n
io C Hamano
Merge bran
c
h 'mv/me
r
ge-custo
m
'
commit
|
commitdiff
|
tree
2008-08-28
Junio C
Hamano
Merge
branc
h
'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
Merge br
a
n
ch 'am/cher
r
y-
p
ick
-
re
r
ere'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branc
h
'jc/a
d
d
-addrem
o
ve'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Me
r
ge branch 'np/
v
e
r
ify-p
a
ck'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Ham
a
no
Me
r
ge branch 'da/submodule-sync
'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio
C
H
ama
n
o
M
erge bran
c
h
'
m
a
in
t
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
ctype
.
c: protect tiny
C
preprocess
o
r constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'af/maint-install-no
-
handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branc
h
'jc/no-slim-sh
e
ll'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o
C Haman
o
M
erge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-26
Junio C Ham
a
n
o
daemon
.
c: mino
r
style f
i
x
u
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
R
e
vert "Build-i
n
"
g
i
t
-she
l
l""
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o
C H
a
mano
Merge br
a
nc
h
'jc/no-slim-
s
h
ell'
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
i
o C Ha
m
ano
Merg
e
br
a
n
ch
'
maint' to
sync with 1
.
6
.
0
.
1
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 Ham
a
no
M
erge branch 'ag/maint-combin
e
-
diff-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge b
r
anch '
m
v/m
a
int-merg
e
-fix' into m
a
int
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
t7606: fix custom merge
t
e
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
mer
g
e
:
fix numerus bu
g
s around "trivial merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
unpack_
t
rees(): protect the handcr
a
fted
i
n-
c
ore index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Junio C Hamano
disc
a
r
d
_cache:
r
e
set lazy name_hash bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Ju
n
i
o C Hamano
t
e
mplates/Make
f
ile: insta
l
l is
unnecessary, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C
H
amano
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
Merge branc
h
'ml/submo
d
ul
e
-for
e
ach'
commit
|
commitdiff
|
tree
next