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
simplify output of conflicting merge
2009-04-05
Cl
e
mens Buc
h
acher
sim
p
lify outpu
t
of conflicting merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
C
lemens Buchacher
update cache for con
f
lict
i
ng su
b
module
entr
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemen
s
B
uc
h
ache
r
add tests for merging with
s
u
bmodule
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
GIT 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
rge bran
c
h 'jc/maint-1
.
6
.
0
-
blame
-
s
'
into
m
aint
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Haman
o
Me
r
ge b
r
anch 'js/mai
n
t
-
d
i
ff-
t
emp-s
m
udge' into mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hamano
Merge
b
ranch 'js/
m
a
i
n
t-1
.
6
.
0
-
e
x
e
c-path-env' into maint
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io
C
Hamano
Merge branch
'bc/maint-1
.
6
.
1-branch-
d
e
leted-was'
into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
erge branch 'tr/maint-
1
.
6
.
1-
d
oc-format-patch
-
-root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
i
o
C
H
amano
Merge branch 'dm/maint-docco' into maint
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merge branch 'maint-1
.
6
.
1
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C
H
amano
Merge br
a
nch 'maint
-
1
.
6
.
0' i
n
to
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-01
Holger Weiß
Documentation:
R
emove a
n
odd "instead"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fi
x
p
ortability proble
m
with I
S
_
RUN_COMMAND_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Johan
n
es Sch
i
n
d
elin
mailmap: res
u
r
rect l
o
w
e
r-casing of
e
mail addres
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Update d
r
aft
r
e
leas
e
notes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merg
e
branc
h
'maint
-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Ju
n
io C
H
amano
Me
r
ge branch '
m
aint
-
1
.
6
.
0' into mai
n
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (aka
.
.
.
F
i
x bash co
m
p
l
e
tion in path with spac
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
T
homas Rast
bash
comp
l
e
tion: o
n
ly show 'log
-
-
m
erge'
i
f merging
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Ni
c
o
-telmich
-
Schot
.
.
.
git-tag(1): add h
i
nt about
c
ommit me
s
sag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Allan
C
a
ffee
D
o
cumentation: update g
r
a
ph ap
i
example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C Hamano
Merge branch 'maint-1
.
6
.
1' into m
a
int
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Me
r
ge br
a
nch 'ma
i
nt-1
.
6
.
0' into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Er
i
c Wo
n
g
git-
s
v
n: fix
ls-
t
ree usa
g
e
wit
h
dash-prefixe
d
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Johan
n
e
s
Schindelin
im
p
ort-zips: fi
x
thi
n
ko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge branch 'main
t
-
1
.
6
.
1'
into maint
commit
|
commitdiff
|
tree
2009-03-28
Emil Sit
te
s
t-lib: Clean up comme
n
ts and
Makefile
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Thomas Ras
t
Do
c
u
mentat
i
o
n
: format-patch
-
-root clari
f
ic
a
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-26
Car
l
o Marcelo
Arenas
.
.
.
documentation
:
upd
a
te
cvsimport description of
"
-r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-26
David J
.
Mel
l
or
D
o
cumentation: Remove spurious
uses of "you"
in gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-25
J
ohannes Sixt
diff
--no-ind
e
x
:
Do not
generate pat
c
h o
u
tput
i
f other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Sha
w
n
O
.
Pearce
I
n
c
r
e
a
se th
e
siz
e
of the
d
ie/wa
r
ning b
u
ffe
r
to
avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Junio C Haman
o
Me
r
g
e branch '
m
aint-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-24
Junio
C Hamano
Merge
branch 'mai
n
t-1
.
6
.
0' into ma
i
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-24
Linus Torvalds
close_sha1_fil
e
(): make it easi
e
r to d
i
ag
n
o
s
e err
o
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Nic
o
las
Pit
r
e
avoid possible overflow
in delta s
i
ze
filtering
c
omputation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
D
ocumenta
t
ion: m
i
nor
g
rammati
c
al fix in git
-
check-ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
Docum
e
ntation: min
o
r grammatical fixes
in git-ch
e
ck
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
D
ocumenta
t
io
n
: mi
n
or grammat
i
cal f
i
xes i
n
g
it-cat-fil
e
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
Da
v
i
d J
.
Mellor
Documentation
:
m
inor grammatical
f
ixe
s
and rewording
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
Dav
i
d J
.
Mellor
Do
c
u
m
entatio
n
:
remove
s
o
m
e uses of the
pas
s
ive voice
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hama
n
o
Merge bran
c
h 'maint-1
.
6
.
1'
i
n
t
o main
t
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
M
e
rge bran
c
h 'maint-1
.
6
.
0
' into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-22
Johanne
s
Schin
d
elin
Smud
g
e the
f
iles fed
t
o exte
r
nal diff
a
nd te
x
tconv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday: use the dashless fo
r
m of git-i
n
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Junio C
Hamano
Update
d
raf
t
release
n
otes
t
o 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Jef
f
King
ls-files:
req
u
ire wo
r
ktree when --deleted is giv
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
René Sc
h
arfe
p
i
ck
a
xe: c
o
unt regex matches only once
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hama
n
o
Me
r
g
e bra
n
c
h 'main
t
-
1
.
6
.
1' int
o
maint
commit
|
commitdiff
|
tree
2009-03-22
J
u
nio C
H
am
a
no
Merge
b
ranch '
t
r
/
maint-1
.
6
.
0-send-ema
i
l-irt' into m
a
int
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merg
e
branch 'm
g
/mai
n
t-submodule-normalize-pa
t
h
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
M
er
g
e branch 'rs/memmem
'
i
n
to maint
commit
|
commitdiff
|
tree
2009-03-22
Junio C
H
amano
Merge br
a
nch 'js/r
s
y
nc-lo
c
al' into maint
commit
|
commitdiff
|
tree
2009-03-22
Junio C
H
amano
Merge
b
ranch 'd
b
/maint-missing-o
r
igin' into maint
commit
|
commitdiff
|
tree
2009-03-22
J
u
n
i
o
C Hama
n
o
Merge b
r
anch 'jc
/
maint-1
.
6
.
0-read-tree-overlay' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C
H
amano
Me
r
ge branch '
j
s
/maint-1
.
6
.
0-pat
h
-nor
m
alize' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Juni
o
C H
a
m
a
n
o
Mer
g
e br
a
nch
'
jc/m
a
int-1
.
6
.
0-pack
-
directo
r
y' i
n
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Stephen Boyd
f
o
r
mat-patch: --numbere
d
-fil
e
s
a
n
d -
-
st
d
out
a
ren't
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Johannes
S
ixt
Pr
o
pagate
-
-exe
c
-path se
t
ting to ext
e
rnal commands
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Brandon Casey
git-branch: display "was
sha1" on bra
n
ch deletion ra
t
her
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-20
Dav
i
d
J
.
Mell
o
r
Doc
u
mentation: rewor
d
exampl
e
text in git-bisect
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-19
Jef
f
King
doc:
clarify how -S works
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-19
D
a
vid J
.
Mellor
D
o
cumentation: r
e
wor
d
ed the "Des
c
rip
t
i
on"
s
ecti
o
n
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-18
J
unio C
Hamano
blame: read cu
s
tom grafts giv
e
n by -S befo
r
e calli
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
D
o
c
u
ment
a
tion: min
o
r grammatical
f
ix
e
s
in git-
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
Documentati
o
n
: minor gram
m
atical fixes
i
n
g
it-blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
Do
c
umenta
t
i
on: r
e
w
o
rd t
h
e "Description"
sec
t
ion of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
Da
v
id J
.
Mellor
Do
c
umentati
o
n: min
o
r grammatical fixes in git-archive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-16
Junio C Hamano
Remo
v
e
t
otal confusio
n
fr
o
m git-fetc
h
and git-push
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-15
Junio C Hamano
GIT 1
.
6
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-13
Junio
C
Haman
o
Merge b
r
a
n
ch 'maint-
1
.
6
.
1
'
in
t
o main
t
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C Hamano
M
e
rg
e
br
a
nch 'maint-1
.
6
.
0
'
into ma
i
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge
branch 'e
n
/mai
n
t-1
.
6
.
1-
h
ash-object' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C H
a
man
o
Merge branch 'ks/maint-1
.
6
.
0-
m
ail
i
nf
o
-folded' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
H
amano
Merge br
a
nch 'cc/main
t
-1
.
6
.
0
-
bis
e
c
t-fix' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge bra
n
ch 'fg
/
m
a
int-1
.
6
.
0-
e
xc
l
u
d
e
-b
q
' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o
C
H
a
m
ano
M
erge branch '
j
s/main
t
-1
.
6
.
1-filter-b
r
anch-submodule
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Haman
o
Me
r
ge branch 'gt/maint-1
.
6
.
1-utf8-width'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Mer
g
e b
r
a
n
ch
'
js/main
t
-1
.
6
.
1-remote-r
e
move-mirror'
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
n
io C
H
a
mano
Merge branch '
e
k/m
a
int-1
.
6
.
1-filter
-
branch-bare' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
unio C Hamano
Merge branch 'jc
/
maint-1
.
6
.
1-add-u-
r
emove-conflicted
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o C Hamano
M
e
rge bran
c
h 'js/maint-1
.
6
.
1
-
rebas
e
-i-s
u
bmodule' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C Hamano
Merge branch 'jc/ma
i
nt-1
.
6
.
1-a
l
low
-
uninteresting-missin
g
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merg
e
branch 'ks
/
mai
n
t-1
.
6
.
0-maili
n
fo-
f
ol
d
ed' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C
H
amano
Merge branc
h
'jk/maint-1
.
6
.
1-cleanup-after-ex
e
c-failu
r
e
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ha
m
ano
Merge
branch '
j
c/maint-1
.
6
.
0-split-di
f
f-metai
n
fo' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
io C Hamano
read-t
r
e
e A B C: do not
c
reate a bogus
in
d
ex and do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-12
Thoma
s
Rast
se
n
d-em
a
il:
t
es
t
-
-no
-
thread --
i
n-r
e
ply-t
o
c
o
mbinat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Ju
n
io
C Hamano
Update draft
release notes for
1
.
6
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
Merge branch 'js/maint-send-
e
mail
'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
M
erge branc
h
'jk/sane-
r
elative
-
t
i
me' into maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
M
e
rg
e
branc
h
'jc/
m
aint-add-p-unquote
'
into maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C Ham
a
no
Merg
e
b
r
anch
'
fg/ma
i
nt-exclude-bq' into maint
commit
|
commitdiff
|
tree
2009-03-11
Ju
n
io C
H
amano
Merge
b
ran
c
h 'en/maint-h
a
sh-object' in
t
o main
t
commit
|
commitdiff
|
tree
2009-03-11
Johann
e
s Schindelin
r
sy
n
c
transpo
r
t
: allow local p
a
ths
,
a
n
d
fix
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Daniel Bar
k
al
o
w
Give err
o
r wh
e
n no
remote
is c
o
nfigured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-08
Junio C Hamano
M
e
rge branch 'maint-1
.
6
.
1' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2009-03-07
Ch
r
is Johnsen
b
u
ilti
n
-rev
e
r
t
.
c: re
l
eas
e
i
ndex lock when
cherry-picking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-07
Jeff Kin
g
document config --bool-or-int
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next