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
Cleme
n
s Buchacher
s
i
m
p
lify output of co
n
flictin
g
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Cle
m
ens Buchache
r
update cache for conflicting submodul
e
entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Bucha
c
her
add tests f
o
r
m
erging with submo
d
ules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
m
a
no
G
I
T
1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
erge bra
n
ch
'
j
c/maint-1
.
6
.
0-blame-s
'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch
'
js/maint-diff-temp-s
m
udge' into m
a
int
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
n
o
Merge branch 'js/maint-1
.
6
.
0-exec-path-env' i
n
to m
a
int
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Me
r
ge b
r
anch 'bc/maint-1
.
6
.
1-b
r
an
c
h
-deleted-was' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
Merge branch 'tr/mai
n
t
-
1
.
6
.
1-doc-format-pat
c
h--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
M
e
rge b
r
a
n
ch 'dm/
m
aint-d
o
cco'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Ham
a
no
M
e
rge b
r
anch 'maint-1
.
6
.
1' into mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Mer
g
e branch 'mai
n
t-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-01
H
olge
r
Weiß
Documentation:
R
emove an odd
"
instead"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix portability pro
b
lem with IS_RUN
_
C
OMMAND_
E
RR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Johannes Sc
h
in
d
elin
m
ai
l
map: resurrect lowe
r
-casing
of email ad
d
resses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C
Ham
a
n
o
Update draft releas
e
notes to 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio
C Ham
a
n
o
Mer
g
e branch
'
ma
i
n
t
-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hama
n
o
Merge branch 'main
t
-1
.
6
.
0
'
i
n
t
o
m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (aka
.
.
.
Fi
x
bash comple
t
ion in path
w
it
h
space
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bash complet
i
o
n
:
o
nly sh
o
w 'log --merg
e
'
i
f merging
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Nic
o
-telmich- Schot
.
.
.
g
it-tag(
1
): add
hint
ab
o
ut co
m
mi
t
messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
A
l
lan Caffee
Documentatio
n
: u
p
dat
e
graph api example
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
Ha
m
ano
Merge branch
'
maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C H
a
m
a
no
Merge bran
c
h 'maint-1
.
6
.
0' int
o
main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Eric
W
ong
git-svn: fix ls-
t
r
ee usage with dash-prefixed
p
aths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
o
h
annes Sch
i
ndel
i
n
import
-
zips: fix thinko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ham
a
no
M
erg
e
branch 'maint-1
.
6
.
1
'
into main
t
commit
|
commitdiff
|
tree
2009-03-28
Emil Sit
test-lib: Cl
e
an up
c
ommen
t
s and Make
f
ile
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Thomas Rast
Doc
u
m
e
ntation: format-pa
t
ch --root clarifications
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-26
Carlo M
a
rcelo
A
re
n
as
.
.
.
documentation
:
upd
a
te cvsi
m
port
description of "
-
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-26
David J
.
Mellor
Document
a
tion: Remov
e
spur
i
ous
u
ses of "you" in git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-25
Johannes Sixt
diff
--no-inde
x
: Do not generate patch output if o
t
her
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-24
S
h
awn O
.
Pe
a
rce
Increase
th
e
size of the die
/
warn
i
ng buffer to avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-24
Jun
i
o
C
H
amano
M
e
rge b
r
anch 'maint-1
.
6
.
1' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-03-24
Junio
C
H
am
a
no
M
e
r
ge branch 'main
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-24
Linus To
r
v
a
l
d
s
c
l
ose_sha1_file(): m
a
k
e
it easier t
o
diagnose
e
rror
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-24
Nicolas
P
i
t
re
avoid possible overflow in
d
elta size fil
t
erin
g
computa
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
Dav
i
d J
.
Mellor
Documentation: minor
g
rammatical fix in gi
t
-chec
k
-
r
ef
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
D
o
cumen
t
ation: minor grammatical fixes
in gi
t
-che
c
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
M
e
llor
Docum
e
nta
t
ion: minor grammati
c
a
l
f
i
xes in git-cat-file
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
Docu
m
entation: minor grammatical fixe
s
and rewordi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mel
l
or
Documentation: remove some uses
o
f
t
h
e pa
s
sive v
o
ice
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Junio C H
a
mano
Merge branch 'maint
-
1
.
6
.
1'
int
o
maint
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
i
o
C Hamano
Merge
b
ra
n
ch
'
m
a
int-1
.
6
.
0
'
into main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-22
Johannes Schi
n
d
elin
Smudge the files
fed
to external diff and textco
n
v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Aguilar
everyda
y
:
use the dashless form of git-init
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Upda
t
e draft release notes
t
o 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Jeff King
ls
-
f
ile
s
: requ
i
r
e
worktre
e
when --deleted i
s
give
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
R
e
né Scharfe
pickaxe: c
o
unt regex matches only onc
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge branch 'm
a
int-1
.
6
.
1' into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
io C Hamano
Merge branch 'tr
/
main
t
-1
.
6
.
0-send-email-irt' into m
a
int
commit
|
commitdiff
|
tree
2009-03-22
J
unio C Hamano
M
erge br
a
nch 'mg/m
a
int-s
u
b
module-normalize-path' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio
C Hama
n
o
Mer
g
e
b
ranch 'rs/memm
e
m' into main
t
commit
|
commitdiff
|
tree
2009-03-22
J
unio C Ha
m
ano
M
erge br
a
nch 'js/rsync-
l
ocal'
in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2009-03-22
Jun
i
o C
H
ama
n
o
Merge branch
'db/m
a
in
t
-
m
issing-origin' into maint
commit
|
commitdiff
|
tree
2009-03-22
Jun
i
o C Hamano
Merge branch 'jc/
m
ai
n
t-1
.
6
.
0-read-tree-over
l
ay' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merg
e
branch 'j
s
/maint-1
.
6
.
0-path-normalize' int
o
main
t
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C H
a
m
a
n
o
M
e
rge b
r
anch
'jc/maint-1
.
6
.
0-pack-di
r
ectory' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
S
t
ephen Boyd
format-pat
c
h: --
n
umbered-f
i
les and --stdout aren't
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Sixt
Propagate --exec-path setting to external comma
n
ds
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Brand
o
n Casey
git
-
branch: display "was
s
ha1" on
b
ranch de
l
etion r
a
ther
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-20
Davi
d
J
.
Mel
l
o
r
Documentatio
n
: r
e
word example text in git-bisect
.
t
x
t
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-19
J
e
f
f
King
doc:
c
l
arify how -
S
work
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-19
David J
.
Mel
l
or
Documenta
t
i
on: reworded the "
D
escription" section o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-18
J
unio C Hamano
bla
m
e: read cu
s
tom gra
f
ts gi
v
en by -S before calling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
Davi
d
J
.
Mell
o
r
D
ocumentati
o
n:
m
inor grammatical fix
e
s in gi
t
-branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
Docum
e
nt
a
ti
o
n
:
m
inor grammatical
f
ixes in g
i
t-blame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mell
o
r
Documentation: re
w
o
rd the "D
e
s
cription" se
c
tion of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
Dav
i
d J
.
Mellor
Documentation: minor gra
m
matical
f
ixes in gi
t
-arc
h
ive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-16
Junio C Hamano
R
emove to
t
al con
f
u
s
ion from g
i
t-fetch and g
i
t-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
Juni
o
C Hamano
Mer
g
e br
a
nch 'maint
-
1
.
6
.
1
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
io C Ha
m
an
o
M
e
rge
br
a
nch 'mai
n
t-
1
.
6
.
0
'
into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
M
erge b
r
anch 'en/maint
-
1
.
6
.
1-hash-object' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
Hamano
Merge
b
ranch 'ks
/
maint-1
.
6
.
0
-
mail
i
n
f
o
-
f
olded' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ham
a
no
Merg
e
branch '
c
c/maint-1
.
6
.
0-bisect-fix'
int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o C Hamano
Merge branch 'fg/maint-1
.
6
.
0-exclu
d
e-bq' i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ham
a
no
Merg
e
b
ranch 'js/maint-1
.
6
.
1
-
filter-bra
n
ch
-
s
ub
m
odule
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge branch 'gt/maint-1
.
6
.
1-utf8-width' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C Hamano
Merge
branch 'js/maint-1
.
6
.
1-remote-r
e
m
o
ve-mirror'
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
io C Ha
m
ano
Mer
g
e
branc
h
'ek/maint-1
.
6
.
1-filt
e
r-
b
ran
c
h-
b
are' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C Hamano
Merge branch 'jc/m
a
int-1
.
6
.
1-a
d
d-u-r
e
mo
v
e-conflicte
d
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ha
m
an
o
Merge branch
'
j
s
/
maint-1
.
6
.
1-rebase-i-submodule' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
io C Hamano
Merg
e
bra
n
c
h
'jc/maint-1
.
6
.
1-allow-u
n
interest
i
ng-missing
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
M
erge branch 'ks/ma
i
n
t
-1
.
6
.
0-mailinfo-folded' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Mer
g
e branch 'jk/main
t
-1
.
6
.
1
-clea
n
up-after-exec-fai
l
ure
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
n
io C Hamano
Merge bra
n
ch
'jc
/
m
aint-1
.
6
.
0-split-diff-met
a
in
f
o'
into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
io C Hamano
read-tree A B C: do not creat
e
a
bogus
i
ndex and d
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-12
Th
o
mas Rast
send-emai
l
:
t
est
-
-n
o
-thread --in-r
e
ply-
t
o comb
i
natio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-11
Junio
C Hamano
U
p
d
a
te draft release no
t
es for 1
.
6
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-11
Junio
C
Hamano
Merge
b
ranch 'j
s
/main
t
-send-e
m
ail' int
o
m
aint
commit
|
commitdiff
|
tree
2009-03-11
Junio C
H
ama
n
o
M
e
r
ge branch '
j
k/sane-relative
-
time' into maint
commit
|
commitdiff
|
tree
2009-03-11
Ju
n
io C Hamano
Merge branch '
j
c
/
maint-a
d
d-p-un
q
uote' into
m
a
int
commit
|
commitdiff
|
tree
2009-03-11
Junio
C
Ha
m
a
n
o
M
erge branch 'fg/maint-excl
u
de-bq'
i
nto maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C H
a
man
o
Merge b
r
a
nch '
e
n/maint-
h
ash-
o
bject'
into maint
commit
|
commitdiff
|
tree
2009-03-11
Joha
n
n
e
s Schindelin
rsync transport: a
l
low local pa
t
hs,
an
d
fix tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-11
Da
n
iel Bark
a
l
o
w
Give error when no remote is conf
i
gured
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-08
Junio C H
a
mano
Merge branch 'maint-1
.
6
.
1'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-03-07
Chr
i
s Johnsen
built
i
n-rever
t
.
c:
r
e
lease index lock when cherry-picking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
document config --bool-o
r
-
int
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next