repo.or.cz
/
git
/
ericb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2009-06-09
Jun
i
o C Ham
a
no
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-06-09
S
ZED
E
R Gábor
bash: add su
p
port f
o
r '
g
it stash po
p
-
-
ind
e
x'
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
SZEDE
R
Gábor
Do
c
umentation:
mention 'git
stash pop --index'
option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Johannes
S
i
xt
S
implif
y
s
ome 'fpr
i
ntf
(
stderr); ret
u
rn -1;' by usi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Johannes S
i
xt
Simp
l
ify so
m
e instances of
run_comma
n
d() by usi
n
g r
u
n_comman
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Stephen
Boy
d
show
-
branch: don't
u
se LASTARG_DEF
A
ULT with OPTARG
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Brand
o
n Casey
se
n
d-email: use UTF
-
8
rather than utf-8 for
c
onsistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Brand
o
n C
a
sey
g
it-s
e
nd-
e
mail
.
perl:
i
mpro
v
e
d
ete
c
tio
n
of M
I
ME e
n
c
ode
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Jo
h
annes Si
x
t
di
f
f
.
c: plug
a m
e
mory
l
e
a
k
in an err
o
r
pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Johannes S
i
xt
fetch-pack:
cl
o
se outp
u
t
c
h
a
nnel
after sideb
a
nd demultiplexe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-08
M
ich
a
el J Gru
b
er
bu
i
ltin-r
e
mote: Make "remo
t
e show" display all ur
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-07
Kj
e
til Barvik
symlinks
.
c: smal
l
sty
l
e cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-07
Junio C Hamano
Mak
e
file: test-parse-op
t
ions d
e
pends on
p
ars
e
-optio
n
s
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-07
Juni
o
C
Hamano
Merge
b
ra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2009-06-06
Th
o
m
a
s Rast
D
o
cumentation: refer to
gitworkflows(7) f
r
om tutorial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-06
Sha
w
n
O
.
Pearce
d
a
e
mon: S
t
rictly parse th
e
"extra arg" part of the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-04
Junio C H
a
mano
Docume
n
tation/git
.
txt: upd
a
te link
s
to release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-04
Junio C Ham
a
n
o
M
erg
e
branc
h
'maint' to sync w
i
th
1
.
6
.
3
.
2
commit
|
commitdiff
|
tree
2009-06-04
Junio C H
a
mano
G
IT 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-04
Daniel Tr
s
tenja
k
Show presence of stashed changes in
bash prompt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
R
ené S
c
harfe
grep: fix empty
word-regexp mat
c
hes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Junio C Hamano
Merge branc
h
'
da
/
p
ret
t
y-tem
p
name
'
commit
|
commitdiff
|
tree
2009-06-03
Linus Torvalds
Clea
n
up and simplify rev_compar
e
_tre
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Junio
C
Ha
m
an
o
Merg
e
branch 'maint
'
commit
|
commitdiff
|
tree
2009-06-03
Ju
n
i
o C H
a
mano
b
l
ame: cor
r
ectly
handle a path that used to be a directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
T
homas Rast
add -i: do not dump patch during a
p
plication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Ju
n
io C Hamano
Update d
r
af
t
release notes for
1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Ju
n
io C Hama
n
o
Merge
b
r
a
n
c
h '
c
b
/
maint-1
.
6
.
0-
x
dl-merge-fix
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merge branch 'rs/m
a
int
-
g
rep-word-regexp-f
i
x
' into maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C H
a
m
a
no
Merge branch 'sb/mai
n
t-1
.
6
.
2-opt-filename-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Junio C
H
amano
Merge b
r
anch 'jc/maint-add
-
p
-
c
oale
s
ce-fi
x
' into maint
commit
|
commitdiff
|
tree
2009-06-02
Junio
C Hamano
Merge branch 't
r
/maint-doc-stash-p
o
p' into maint
commit
|
commitdiff
|
tree
2009-06-02
Cle
m
ens Buchacher
t
est-lib: fix ht
t
p exit
c
o
d
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Cl
e
mens Buchacher
test-lib: allow exit t
r
a
p to
be used
for cleanup b
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
C
l
emens Buchacher
test-lib: fail if invalid options are
passed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
René Sc
h
ar
f
e
gre
p
: fix colouring of matches with zero length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
St
e
phen Bo
y
d
git-
s
how-bran
c
h
.
t
xt: doc
u
ment
--
d
ate-or
d
e
r option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Agui
l
a
r
dif
f
:
generate pretty filenames in prep_t
e
mp_b
l
ob(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
c
ompat: add a basename() c
o
mpatib
i
lity funct
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
co
m
pat: add a mkste
m
p
s
() compatibility fun
c
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Junio
C
Hama
n
o
Merge branc
h
'sb/opt-fi
l
ename'
commit
|
commitdiff
|
tree
2009-05-31
J
u
nio C Hama
n
o
Merge branch 'j
c
/solaris-0811
'
commit
|
commitdiff
|
tree
2009-05-31
Jun
i
o
C
Hamano
Merge branch
'
s
b
/
s
h
ow-branch-parse-options'
commit
|
commitdiff
|
tree
2009-05-31
Junio C Haman
o
Merge bran
c
h 'mm/apply
-
doub
l
e-sl
a
s
h
'
commit
|
commitdiff
|
tree
2009-05-31
Junio
C Hamano
Merge branch 'sb/format-patch
-
pa
r
s
eo
p
t'
commit
|
commitdiff
|
tree
2009-05-31
Junio C H
a
mano
Mer
g
e bra
n
ch
'
j
c/mkt
r
e
e'
commit
|
commitdiff
|
tree
2009-05-31
Junio C Ham
a
no
Merge branch 'ew
/
s
v
n-test-and-old-i18
n
'
commit
|
commitdiff
|
tree
2009-05-31
Ju
n
i
o
C
Hamano
Mer
g
e
b
ranch 'mw/send-em
a
il'
commit
|
commitdiff
|
tree
2009-05-31
Ju
n
io C Ham
a
no
Mer
g
e branch 'cc/
b
i
se
c
t'
(
ea
r
ly part)
commit
|
commitdiff
|
tree
2009-05-31
Je
f
f K
i
ng
git-
a
dd: no ne
e
d fo
r
-f when
r
esolving a conflict in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Stephen B
o
yd
config
.
t
xt: docu
m
ent
add
.
i
g
nore-errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
S
Z
EDER Gáb
o
r
bash:
r
emov
e
always t
r
ue if sta
t
e
ment from _
_
git_ps1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Björn St
e
in
b
r
i
nk
git-ap
p
ly(1): Clarify that one can s
e
lect where
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
C
l
emens B
u
chacher
http-push: reus
e
existin
g
i
s_
n
ull_re
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Eric Wong
t9139 uses ancient, b
a
ckwards-compatible iconv names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
J
u
nio
C
H
amano
Merge gi
t
://
g
it
.
bogomip
s
.
org/git-svn
commit
|
commitdiff
|
tree
2009-05-31
Thomas Rast
Doc
u
m
e
ntation: teach
s
tash/
p
o
p
wor
k
flow instead of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
Ju
n
io C Hamano
Mer
g
e branch '
s
b
/
m
ai
n
t-1
.
6
.
2
-
opt-filename-fix'
commit
|
commitdiff
|
tree
2009-05-29
J
u
nio C Ham
a
no
Merge branch 'jc/maint-add-p-coalesce-fix'
commit
|
commitdiff
|
tree
2009-05-29
Juni
o
C Ham
a
no
Merge
b
r
anch
'rs/ma
i
n
t-grep-word-regexp-fix'
commit
|
commitdiff
|
tree
2009-05-29
Step
h
en Boyd
t
9
12
0
: don't
exp
e
ct
fai
l
ure with S
V
N_HTTPD_PORT unset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
Thomas Rast
Docum
e
ntation: tea
c
h
stash/pop
workflow
i
nstea
d
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
Ju
n
io C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-05-28
C
l
e
m
ens Buchacher
fix segfault showing an empty remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-28
B
r
and
o
n Ca
s
ey
t8005: fix
t
yp
o
, it's ISO-8859-5, n
o
t KOI8-R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-27
Stephen Boyd
t5500: Mo
d
ernize t
e
s
t sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-27
Junio C Hamano
completion:
f
i
x PS1 display during an A
M
on detach
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-27
Benjamin
Kramer
i
map-send: add suppo
r
t for IPv6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Update draft rel
e
ase
n
otes to 1
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Haman
o
Me
r
ge branch
'maint'
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Hamano
Prepare for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o
C
Hamano
M
erge branch 'js/maint-no-ln-
a
cross
-
libexec-and-bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge bran
c
h
'lt/maint-diff-reduce-lstat' int
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
Hamano
M
er
g
e branch 'jm/format-patc
h
-
no
-
a
uto-n-when-k-i
s
-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge bran
c
h 'do/maint-merge-recursive-fix' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Hamano
Merge bra
n
ch 'jk/mai
n
t-1
.
6
.
0-trace-a
r
gv' int
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
H
ama
n
o
Merge bran
c
h 'np/push-delta' into
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branc
h
'ar/merge-one
-
file-di
a
g'
i
n
to maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C H
a
ma
n
o
Merge
bra
n
ch 'ar/
u
nl
i
nk-err' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
un
i
o C
Hamano
Merge branch 'jk/main
t
-add-empty'
i
nto
m
ai
n
t
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix cat-file usage message and documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
J
e
ff King
fetch: report ref storag
e
DF
e
r
r
or
s
more accu
r
at
e
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Je
f
f K
i
ng
lo
c
k_re
f
: inf
o
rm callers of un
a
va
i
labl
e
ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jef
f
King
c
onvert bare readlink to strbuf_readlink
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
J
o
ha
n
nes Sixt
t3701: ensure co
r
rec
t
ly set up repository after sk
i
pped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Mic
h
ael J Gr
u
ber
m
erge-opt
i
ons
.
txt: Clarify merge
-
-
sq
u
a
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
S
t
ephen Boyd
parse-o
p
ts
:
add OPT_F
I
LENAME a
n
d tra
n
sition builtins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
St
e
phen Boyd
parse-opts
:
prepar
e
for OPT_FILENAME
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
J
u
n
io C Hama
n
o
Me
r
ge
b
ranch 'jc/mktree' into
s
b/opt-filenam
e
commit
|
commitdiff
|
tree
2009-05-25
J
u
nio C
H
amano
M
e
r
ge branch 'sb/fo
r
mat-pat
c
h-
p
arseopt
'
i
nto sb/o
p
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
J
u
nio
C Ha
m
ano
Merge br
a
nc
h
'sb/
s
how-branch-
p
ars
e
-op
t
ions' into sb
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Junio
C
Hamano
Merge b
r
a
nc
h
'master' into
sb/
o
pt-f
i
lename
commit
|
commitdiff
|
tree
2009-05-25
Charles Ba
i
ley
Change xdl_merge to gen
e
rate o
u
tput even for
null
m
erge
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bail
e
y
t6023: merge-file
f
ails t
o
ou
t
put any
t
h
ing for a degenerate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
J
unio
C
H
a
m
ano
Merg
e
branch '
m
a
int'
commit
|
commitdiff
|
tree
2009-05-24
Junio C Ha
m
ano
Merg
e
branch
'
maint-1
.
6
.
2' into
maint
commit
|
commitdiff
|
tree
2009-05-24
J
unio C Haman
o
M
e
rge b
r
a
nch 'maint-
1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio C
H
am
a
no
Me
r
ge branch 'maint-1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
M
icha
l
Marek
appl
y
: hand
l
e filenames wi
t
h
doubl
e
sla
s
hes better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Alex Riesen
http
-
push
.
c:
:
remove_lo
c
ks()
:
f
ix use after free
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next