repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cb/maint-no-double-merge' into maint
2009-06-22
Junio C Hamano
Merge branch 'c
b
/mai
n
t-
n
o
-
doubl
e
-merge'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2009-06-22
Junio C Ha
m
ano
Merg
e
bran
c
h 'mn/m
a
int-iconv
-
au
t
oconf
'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-06-22
J
u
n
i
o C Hamano
Me
r
ge branch
'lt/maint-unsign
e
d
-left-shift
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Me
r
g
e
br
a
n
c
h
'pb/
m
aint-1
.
6
.
2
-
u
serdiff-fix' into maint
commit
|
commitdiff
|
tree
2009-06-21
Junio
C
H
a
m
a
n
o
attribute: wh
i
tespace set to
tru
e
detects all erro
r
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Nanako
S
h
iraishi
.
gitattributes: CR at the
e
nd o
f
the line is an error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C H
a
mano
t
3
505: fix abuse of test_expe
c
t_code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge br
a
nch 'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge
b
ranch 'maint-1
.
6
.
1' into mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio
C
H
am
a
no
Merg
e
branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-21
Ste
p
hen Boyd
gi
t
-
s
h
o
w-
r
e
f
.
txt: remove word and make consistent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
M
iklos Vajna
git-sv
n
do
c
umentati
o
n: fix typo in '
r
e
base vs
.
pull
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Mark Lodato
http
.
c: fix com
p
iling with libcurl 7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
J
o
ha
n
nes Schindeli
n
impo
r
t-tars: support symlin
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
René Scharfe
upload
-
archive: fix in
f
inite lo
o
p
on Cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
P
a
olo
B
onzini
avoid exponential regex
m
atch for java an
d
objc function
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-18
Li
n
us Torval
d
s
Fix
big left-s
h
ifts o
f
unsigned char
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-15
Steph
e
n Boyd
pull, rebase:
simp
l
ify to use die()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-14
Jim Meyer
i
ng
use xst
r
dup, no
t
strdup in ll-merge
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-14
Junio
C
Hamano
Merge branch 'm
a
i
n
t-1
.
6
.
2'
into maint
commit
|
commitdiff
|
tree
2009-06-14
Junio C
H
am
a
no
Merge b
r
anch 'main
t
-1
.
6
.
1
'
i
nto maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Junio C
Ham
a
no
Me
r
g
e
branch 'm
a
int
-
1
.
6
.
0' into main
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-13
Stephe
n
Boyd
git-r
e
rere
.
txt
:
g
ram
m
atical fix
u
ps and clean
u
ps
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-12
Paol
o
Bonzin
i
Documentation: git-se
n
d-mail can
t
a
ke
r
ev-li
s
t arg
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-11
Junio
C Hamano
M
e
rge b
r
a
nch 'uk/maint-1
.
5
.
3-re
b
as
e
-i-re
f
lo
g
' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-11
Uwe Kle
i
ne-Kö
n
ig
r
ebase--
i
nteractive: remote stray cl
o
sing parenthe
s
is
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-09
Johannes Sixt
diff
.
c: pl
u
g a m
e
mor
y
lea
k
i
n
an error path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-09
Johannes Six
t
fetch-pack: close
outpu
t
c
h
annel after sideband
demulti
p
lexe
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-09
Marco
N
elissen
f
ix handling of ic
o
nv c
o
nfi
g
uration
o
ptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-08
Mi
c
h
a
e
l J Gr
u
ber
bui
l
t
i
n
-
r
emote: Mak
e
"
r
e
mote
show" d
i
splay all urls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-06
Thom
a
s Ras
t
Docum
e
ntation: refer to gitwo
r
kflows(7) from tutorial
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-06
Sh
a
wn O
.
Pearce
da
e
m
o
n: Strictly par
s
e the "ex
t
ra a
r
g" part o
f
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-04
J
u
nio C H
a
man
o
GIT 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-03
René S
c
harfe
grep: fix e
m
pty word-r
e
gexp
matc
h
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-03
Junio C Hamano
blam
e
: corr
e
c
t
ly han
d
l
e a path that used to be a d
i
re
c
t
o
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-03
T
h
omas Rast
add -i: do not dump patch during appl
i
cat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
Juni
o
C
Hamano
Update draft release not
e
s for 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o C Hamano
Merge branc
h
'cb/maint-1
.
6
.
0-
x
dl-merge
-
fi
x
' into maint
commit
|
commitdiff
|
tree
2009-06-02
Junio
C Haman
o
M
e
r
g
e branch 'rs/ma
i
nt-g
r
ep-w
o
rd-regexp-fix' into maint
commit
|
commitdiff
|
tree
2009-06-02
Juni
o
C Ha
m
a
n
o
Me
r
ge bran
c
h
'
s
b
/maint-1
.
6
.
2-o
p
t-filename-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Junio
C Hamano
Merge branch '
j
c/mai
n
t-add-p-coale
s
ce-fi
x
' into
maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merge b
r
a
nc
h
'tr/m
a
int-doc-stash-pop' i
n
to maint
commit
|
commitdiff
|
tree
2009-06-02
Ren
é
Sch
a
rfe
g
r
ep: fix colour
i
ng of
matches
w
ith zero
l
e
ngth
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
C
l
emens Buchac
h
er
refuse to mer
g
e during a mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-29
Thomas
R
ast
Documentation: teach st
a
s
h/pop workflo
w
i
nstead of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-28
Clemens Bu
c
hacher
fix segfault showing an
e
mpty remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hama
n
o
Prepare fo
r
1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
Me
r
ge branch
'
js/maint-no-
l
n
-
a
cross-libexec-and-
b
in
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C H
a
mano
Merge br
a
nch 'lt/maint-
d
iff-r
e
duce-lstat'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Ham
a
no
M
erge branch 'jm
/
format-patch-no-a
u
to-
n
-w
h
en
-
k
-
i
s-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C Haman
o
Merge branch 'do/
m
a
int-m
e
rge-recursive-fix
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
J
un
i
o C Hamano
Merge
branch 'jk/maint-1
.
6
.
0-trace-ar
g
v' into maint
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C Hamano
Merge br
a
n
c
h 'np/pu
s
h-de
l
t
a
'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Me
r
ge br
a
nch 'ar/merge-one-f
i
le-diag'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
J
unio C Hamano
Merge b
r
anch 'ar/unli
n
k
-
err' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-26
Junio C H
a
mano
Merge branch 'jk/maint-add-empty' int
o
m
aint
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix
cat-file usage message and d
o
cumen
t
atio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Jeff
K
ing
fe
t
ch: report re
f
s
torage DF errors m
o
re a
c
curately
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Jeff Ki
n
g
l
ock
_
ref: inform
calle
r
s
of
u
navaila
b
le ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Joha
n
nes Sixt
t3701: e
n
sure corre
c
tly set up repository after skipped
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Michael
J
G
ru
b
e
r
m
e
rge-options
.
txt: Clarify merge -
-
squas
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_merge to generate outp
u
t ev
e
n
f
or
n
ull merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Bailey
t6023
:
merge-file
fails
to ou
t
put anything for a degenerate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge
bra
n
ch
'maint-1
.
6
.
2
'
into
maint
commit
|
commitdiff
|
tree
2009-05-24
Jun
i
o
C Haman
o
M
e
r
ge branch 'maint-1
.
6
.
1
'
into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio
C
Hamano
Merge br
a
nch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Ale
x
Riesen
htt
p
-
push
.
c::remove_locks(): fix use after free
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
René Scharfe
grep: fix word-regexp at the beginning of lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
St
e
ph
e
n
B
o
yd
a
p
ply,
fmt
-
m
e
rge-m
s
g: use relative filenames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
Stephen
B
o
yd
commit: -F override
s
-t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
René
S
charfe
g
rep: fix
word
-
re
g
exp
c
ol
o
uring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Giuseppe
B
ilotta
completion: use gi
t
rev-parse to detec
t
b
a
re repo
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Johannes S
c
h
i
ndelin
Cope be
t
ter with a _lot_
o
f packs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-20
J
e
ff King
f
or-each-ref: fi
x
segfault i
n
c
o
py_email
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Stephen Boy
d
show-br
a
nc
h
:
F
i
x die me
s
sage in pars
e
_reflog_
p
aram()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
S
tephen Bo
y
d
c
o
m
p
letion:
a
d
d missing options to show-branch and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Linus Torva
l
ds
d
i
r
.
c
:
c
lean up handl
i
ng of 'path' parameter
in rea
d
_
d
irecto
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
D
a
n
M
c
Gee
Fi
x
t
ype-punning i
s
sues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Nan
a
ko Shir
a
ishi
test: checkout
shoul
d
n
'
t say t
h
at
HEAD has moved if
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio
C
Hamano
co
m
p
letion: enhance "current
br
a
n
ch" displ
a
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio
C
H
amano
complet
i
on: simplif
y
"current bra
n
ch"
i
n __git_p
s
1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Haman
o
com
p
letion: f
i
x PS
1
display during a merge on det
a
ched
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Juni
o
C Hamano
R
ever
t
"git-add-
-
interactive:
remove
h
unk
coalescing
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Matt Grah
a
m
Sp
l
itting a hunk
th
a
t add
s
a line at the
top f
a
ils
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Daniel Co
r
der
o
buil
t
in-checkout: Don't tell user t
h
at HEAD has m
o
ve
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Jim Meyering
p
re-commit
.
sample: don'
t
prin
t
incidental SHA1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Boyd
tests: Add tes
t
s for missing fo
r
mat-patch long
o
pti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
S
t
ep
h
en Boyd
a
pi-parse-op
t
ions
.
txt:
use 'fu
n
c' instead of 'func
t
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
T
o
ny Kemp
Turn on USE_ST_TIME
S
PEC for OpenBSD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Junio C Hamano
Mer
g
e br
a
nch 'maint-1
.
6
.
2'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-14
Junio C Hama
n
o
M
e
rge
b
ranch
'
maint-1
.
6
.
1' into
m
aint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio C
H
amano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-14
Johannes Sch
i
nd
e
l
in
Add NO_CROSS_DIREC
T
ORY_HARDLI
N
K
S
suppor
t
to the Makefi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-13
Junio C Hamano
GIT 1
.
6
.
3
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-12
Junio
C
H
am
a
no
Merge b
r
anch '
m
a
i
n
t
-1
.
6
.
2'
i
n
to
maint
commit
|
commitdiff
|
tree
2009-05-12
J
unio C Haman
o
M
e
rge
branch
'
jc
/
maint-read-tree-mu
l
ti
'
i
n
to mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Ju
n
io C Haman
o
R
e
v
ert
"checkout branch:
p
rime cache-tree
full
y
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Alex Riesen
ls-tree manpage: output of ls-t
r
ee is compatible with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Alex Ri
e
sen
l
s
-tree
ma
n
page
:
u
se "u
n
less" instead o
f
"when
.
.
.
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Dave Olszewski
merge-recursive: never leave
index unmerged
w
hi
l
e recursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next