repo.or.cz
/
git
/
jrn.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' to sync with 1.6.3.2
2009-06-04
Junio C Hamano
M
e
rge
br
a
n
ch 'maint'
to sync with 1
.
6
.
3
.
2
commit
|
commitdiff
|
tree
2009-06-04
J
u
nio
C Ha
m
ano
GIT 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-04
D
a
niel Tr
s
tenjak
Sh
o
w presence of stashed changes in
b
a
sh prompt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
René Scharf
e
g
r
ep: fix empty
word-regex
p
matches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Junio C
H
amano
Merge b
r
anch 'da/prett
y
-
t
e
m
pname'
commit
|
commitdiff
|
tree
2009-06-03
Lin
u
s Torvalds
Clean up
a
nd simpl
i
fy r
e
v_com
p
are_
t
ree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Junio C
H
a
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-06-03
Junio C Hamano
blame: co
r
rectly handle
a path t
h
at used
t
o
be a direct
o
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Thom
a
s Rast
add -i: do
not dump
patch durin
g
a
pplication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Junio C H
a
mano
U
pdate d
r
aft re
l
e
ase notes for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Junio
C
H
ama
n
o
Merge bran
c
h '
c
b/m
a
int-1
.
6
.
0
-
xdl-merge-fix' in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
M
e
rg
e
branch 'rs/maint-grep-
w
ord
-
regexp-f
i
x' into maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
M
er
g
e b
r
an
c
h 'sb/maint
-
1
.
6
.
2-opt-filename-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Ju
n
i
o
C
Ha
m
ano
Merge b
r
a
n
ch
'j
c
/
m
aint-add-p-coalesce-fix' into
maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merge b
r
an
c
h 'tr/
m
a
int-doc-
s
tash-pop' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2009-06-02
C
l
eme
n
s
Buchacher
test-li
b
: fix h
t
tp
e
x
i
t code
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Buchacher
t
e
st-l
i
b:
allow exit trap to be
used for cleanup by
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Buchacher
test
-
lib: fail i
f
invalid o
p
tions are
passed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
René Scharfe
g
r
ep
:
fix colouring of matches with
z
ero length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
Stephen Bo
y
d
git-show-branch
.
t
xt: d
o
cu
m
ent
-
-date-order optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
diff: generate pretty filenames in
p
rep
_
t
emp_blob()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
pat
:
add a basename
(
) c
o
mpatibi
l
ity
funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguil
a
r
compat
:
a
d
d a mkst
e
mps() co
m
patibility func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Juni
o
C Hamano
M
erg
e
branch 'sb/o
p
t-filena
m
e'
commit
|
commitdiff
|
tree
2009-05-31
J
u
n
i
o C Hamano
M
e
rge branch 'j
c
/solaris-0811'
commit
|
commitdiff
|
tree
2009-05-31
Junio C Ha
m
ano
Merge branch 'sb/show-b
r
anch-parse
-
o
ptions'
commit
|
commitdiff
|
tree
2009-05-31
Junio C Ham
a
no
Merge br
a
nch
'
mm/apply-double-slash
'
commit
|
commitdiff
|
tree
2009-05-31
Junio C Hamano
Merge branch 'sb/format-p
a
t
c
h-parseopt'
commit
|
commitdiff
|
tree
2009-05-31
Junio C
H
a
mano
Merge
branch 'jc/mktree'
commit
|
commitdiff
|
tree
2009-05-31
Junio C
H
amano
Merge
branch 'ew
/
svn-test-and-old-
i
18
n
'
commit
|
commitdiff
|
tree
2009-05-31
Junio C Hamano
Merge
branch 'mw/
s
end-email'
commit
|
commitdiff
|
tree
2009-05-31
Ju
n
i
o
C Haman
o
Merge branch 'cc/bisec
t
' (early part)
commit
|
commitdiff
|
tree
2009-05-31
J
e
f
f King
git-
a
dd: no need for -f
when
r
esolv
i
n
g a confl
i
ct
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
S
tephen Boyd
config
.
txt: do
c
ument
a
d
d
.
ignore-e
r
rors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
SZED
E
R Gáb
o
r
bash:
r
em
o
ve always true
i
f
statement from _
_
git_ps1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Björn Ste
i
nbrink
git-apply(1):
Clarify that
one
c
an
s
elect w
h
e
r
e
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Cleme
n
s Buchacher
http-push: reuse ex
i
st
i
ng i
s
_
n
ull_ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Eric Wong
t91
3
9 uses anc
i
ent, backwards-compatible
i
conv
n
a
m
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Junio
C Hamano
Mer
g
e gi
t
://gi
t
.
bogomips
.
o
r
g
/
git-svn
commit
|
commitdiff
|
tree
2009-05-31
Thom
a
s
R
ast
D
o
c
u
mentation:
t
e
ach stash/pop workf
l
ow i
n
stea
d
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
Jun
i
o
C
H
aman
o
Merg
e
branch 'sb/
m
aint-1
.
6
.
2
-
opt-filename-fix'
commit
|
commitdiff
|
tree
2009-05-29
Junio C Hamano
Merge branch 'jc/
m
aint-a
d
d-p-coalesce-fix'
commit
|
commitdiff
|
tree
2009-05-29
Junio
C
Hamano
Merge branch 'rs/maint-
g
rep-w
o
rd-regexp
-
fix'
commit
|
commitdiff
|
tree
2009-05-29
S
tephen Boyd
t9120: don't expect fail
u
re with
SVN_HTT
P
D_PORT unse
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
T
h
omas Rast
D
ocumentation: t
e
a
c
h stash/pop wo
r
kflow ins
t
ead of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
Junio
C Ham
a
no
M
e
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-05-28
Clemen
s
B
u
chacher
f
ix segfault showi
n
g an em
p
t
y remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-28
Brandon Case
y
t8
0
05: fix
t
y
po, i
t
's ISO
-
8859-5, not KOI
8
-R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-27
Stephen Boyd
t5500: Moder
n
i
ze
test style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-27
Junio
C
Hamano
completi
o
n: fix PS1
d
i
s
play during an
AM on
det
a
ched
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-27
Benjamin Kramer
imap-
s
end:
a
d
d
s
uppo
r
t for IPv
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Hamano
Upd
a
te d
r
a
f
t re
l
ease notes to 1
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hamano
Mer
g
e
b
ran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2009-05-26
Junio
C Hamano
Prepare
f
or 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hamano
M
erge branch
'js/ma
i
nt-no-
l
n-across-li
b
exec-and-b
i
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hamano
M
erg
e
branch '
l
t/mai
n
t
-
diff-reduce-lstat' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
unio C Hamano
Merge
bra
n
ch '
j
m/format-patch-no-auto-n-when-k-
i
s-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C H
a
mano
Merge branch 'do/mai
n
t-merge
-
re
c
ursi
v
e-fix' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C
H
amano
Mer
g
e branch
'jk/maint-1
.
6
.
0-trace-argv' into
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Haman
o
Merge branch 'np/push-
d
elta'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
Ham
a
no
Merge br
a
nch 'ar/me
r
g
e-one-
f
ile-di
a
g' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C Ha
m
ano
Merge branch
'ar/unlink-err' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C H
a
mano
Merge branc
h
'j
k
/main
t
-add-e
m
pty' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fi
x
cat-f
i
le us
a
g
e
m
ess
a
ge an
d
documen
t
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fe
t
ch: repor
t
r
e
f
stor
a
ge DF errors more
a
c
cu
r
ately
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff K
i
ng
lock_ref: i
n
form calle
r
s of una
v
ailabl
e
ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Je
f
f
King
conve
r
t bare readlin
k
t
o
strbuf_r
e
adlin
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Johannes Si
x
t
t3
7
01
:
en
s
ur
e
c
o
rre
c
tl
y
set up repository after skipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Mich
a
e
l
J Grube
r
m
e
rge-options
.
txt: Clarify merge --
s
qu
a
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Stephen Boy
d
parse-opts: add OPT_FI
L
E
N
AME
a
n
d t
r
ansition b
u
i
lt
i
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Ste
p
hen Boyd
pars
e
-o
p
ts: prepare for OPT_
F
ILENAME
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Ju
n
io C
Ham
a
no
Merge
b
ranch 'jc/mktree'
in
t
o
sb/opt-filena
m
e
commit
|
commitdiff
|
tree
2009-05-25
J
u
n
io C Hama
n
o
Merge
b
ranch 's
b
/forma
t
-patch-pars
e
opt' into sb/
o
pt
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Junio C H
a
mano
Mer
g
e branch 'sb/show-bran
c
h-p
a
rse-options' in
t
o sb
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Junio C Ha
m
ano
Merge
b
ranch 'ma
s
ter
'
into sb/
o
pt-filename
commit
|
commitdiff
|
tree
2009-05-25
Charle
s
Bailey
Change xdl_merge to
g
e
nerate output even for null
merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
C
harles Baile
y
t6023
:
merge-file
fails to out
p
u
t
a
nyt
h
i
n
g for a degenerate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Jun
i
o C Hama
n
o
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge branch
'
mai
n
t-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-24
J
u
nio C Hamano
M
e
rge branch 'maint-1
.
6
.
1' i
n
to main
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge branch 'maint
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Michal
Marek
apply: handle
f
ile
n
a
m
es w
i
th dou
b
l
e
slash
e
s better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Alex Riesen
http-
p
us
h
.
c::remov
e
_locks(): fix use af
t
er free
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Nguy
ễ
n Thá
i
Ngọc Duy
t/t3400-r
e
base
.
s
h
: add more te
s
ts t
o
help
m
igrating
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
René
S
c
ha
r
fe
gr
e
p
: fix
w
ord-regexp at the
b
eginning of lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Stephen
B
oyd
a
pply, fmt-merge-msg: us
e
r
e
l
a
t
ive fi
l
enames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Stephen Boyd
c
o
m
m
it
:
-F override
s
-t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Jim Meyering
post-receive-em
a
il: hooks
.
s
h
owr
e
v
: show how to
include
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Joh
a
nnes Schi
n
d
elin
M
i
nGW: Fix compile
r
warning
i
n merge-recursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Joh
a
nne
s
S
c
hindelin
M
i
nGW: A
d
d
a
simple getpass()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Johannes Schi
n
delin
MinGW: use POSIX si
g
n
a
t
u
re of waitpid()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Joh
a
nnes Schindelin
MinGW: the path
s
eparator to
spl
i
t
GITPERLLIB is
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
P
eter
Harris
MinGW: Scan for \r in addition to \n
when reading s
h
bang
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Junio C Hamano
Merge
b
ranch
'
jn/gi
t
w
eb-cl
e
anup'
commit
|
commitdiff
|
tree
2009-05-23
Junio C H
a
mano
Merge branch 'mg/track'
commit
|
commitdiff
|
tree
2009-05-23
Junio
C
H
a
m
a
no
M
e
r
g
e b
r
an
c
h 'fc/dec
o
r
a
te-ta
g
'
commit
|
commitdiff
|
tree
2009-05-23
Ju
n
io C Ham
a
n
o
M
e
rge bran
c
h 'tp/sen
d
-
emai
l
-from-c
o
nfig'
commit
|
commitdiff
|
tree
2009-05-23
Junio C Hamano
Merge branch
'
js/maint-no-ln-ac
r
o
ss-li
b
exec-and-b
i
n'
commit
|
commitdiff
|
tree
2009-05-23
Juni
o
C Ha
m
a
n
o
Merge bra
n
ch 'da/mergeto
o
l-lib'
commit
|
commitdiff
|
tree
2009-05-23
Jun
i
o C H
a
mano
M
e
rge branch 'cc/bisect
'
(ea
r
ly
p
art)
commit
|
commitdiff
|
tree
next