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 in 1.6.5.4
2009-12-03
Junio C Hamano
M
erge
i
n
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Gi
t
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
Ha
m
ano
Unconditio
n
all
y
s
et m
a
n
.
base
.
url
.
for
.
relati
v
e
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Git
1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Hors
t
H
.
von
B
r
and
git-pull
.
sh
:
Fix call to git-merge
f
o
r new command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Pre
p
are for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
H
a
mano
mer
g
e: do not a
d
d
standar
d
message w
h
en
me
s
sage is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
D
o n
o
t misiden
t
i
fy "
g
i
t
m
erge
foo
HEAD" as an
ol
d
-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update dra
f
t rele
a
se no
t
es to 1
.
6
.
6 before -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
ni
o
C
H
am
a
n
o
Merge
branch
'maint'
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
M
e
rge branch
'
jc/dep
r
ecate-old-sy
n
t
ax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
n
o
git-merge: a deprecation not
i
ce of the ancient c
o
mmand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
rge branch 'bw/remote-get-re
f
-states-f
i
x
'
commit
|
commitdiff
|
tree
2009-12-01
Bert
Wesarg
ge
t
_ref_
s
tates: strdup entries an
d
fr
e
e
util in sta
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
Aguilar
help: Do not unnec
e
ssaril
y
look for a
reposit
o
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
M
ichael J Gru
b
er
Documentation: Fix a few i
.
e
.
/e
.
g
.
mix-
u
ps
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
Merge
b
ranc
h
'
jn/gi
t
web-bla
m
e
'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Nare
b
s
ki
gitweb:
A
d
d link to
other b
l
ame
implementation in blame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jakub N
a
rebski
gitweb: Ma
k
e linkin
g
to acti
o
ns requiring Jav
a
S
cript
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merge
b
ranch 'fc
/
main
t
-f
o
rmat-patch-
p
ath
s
pec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
M
e
rge branch 'mm/maint-merge-ff-e
r
ror-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge br
a
n
c
h 'ap/m
a
int-merge-stra
t
egy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
b
ranch 'jc/p
r
etty-lf
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'
cc/bisect
-
doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'em/com
m
it-cl
a
im'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merge branch 'j
c
/mailinfo-remove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Me
r
ge br
a
nch 'fc/se
n
d
-
ema
i
l-envelope'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merge bran
c
h 'uk/
m
aint-shortlog-encodin
g
'
commit
|
commitdiff
|
tree
2009-11-30
J
uni
o
C Hamano
Merge b
r
anch 'n
s
/send-email-no-chain-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge branch
'jc/maint-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
M
erge branch
'
bw
/
diff
-
color-hunk-header'
commit
|
commitdiff
|
tree
2009-11-30
David S
o
ria Parra
Documentation:
D
oc
u
ment --branch optio
n
in
git clone
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Mo
y
b
u
i
ltin-merge:
show user-friend
l
y error message
s
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
M
a
tthieu Moy
m
e
rge-r
e
cursive:
m
ake the error-message ge
n
eration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthew
Ogilvie
t
/
README:
D
o
c
um
e
nt G
I
T_TEST_INSTALLED and GIT_T
E
ST_EXEC_PATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthew Ogilv
i
e
t3409 t4107
t
7406
t
9150: use dashles
s
commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
A
v
ery
Pe
n
narun
builtin-merge
.
c: call ex
c
lude_cmds() c
o
rrect
l
y
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthew Ogilvi
e
t
2300: use docum
e
nted t
e
ch
n
ique to invoke git-sh-se
t
up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-29
Nanako Shiraishi
prepare
s
end-email for smoother ch
a
ng
e
of --chain-r
e
ply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio C
H
am
a
no
Upda
t
e
d
raft release notes to 1
.
6
.
6 before
me
r
ging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jonathan Nieder
Makef
i
le:
do
n
ot clean arm d
i
rectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Bert W
e
sa
r
g
Giv
e
the hunk comment its own c
o
l
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Fe
l
i
p
e
Cont
r
eras
s
end-em
a
i
l
:
automatic envelop
e
sender
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Ju
n
io C Hama
n
o
emit_line(): d
o
n
't emit an em
p
ty
<SE
T
><
R
E
S
E
T
> followed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ham
a
n
o
Remove
dead code from "git
am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Jun
i
o
C Hamano
Merge bran
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-11-27
Joha
n
nes Si
x
t
Add a notice tha
t
only certain
f
u
nctions can
p
r
int
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
F
elipe Co
n
treras
f
o
rm
a
t-patch: add te
s
t for
parsi
n
g o
f
"--"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Con
t
reras
format-
p
a
t
ch: fix parsing of "--"
on th
e
comm
a
nd
line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
H
amano
buil
t
in-apply
.
c: pay attentio
n
to
-
p<n> wh
e
n
de
t
e
r
mi
n
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Björn
G
ust
a
vss
o
n
gitw
o
r
kfl
o
ws: Consistently back-quote
git commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kleine-König
shortl
o
g: respe
c
t
co
m
mit encoding
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Junio
C Hamano
Merge b
r
anch '
r
s/work
-
around-
g
rep-opt-i
n
s
an
i
ty'
commit
|
commitdiff
|
tree
2009-11-25
B
enjamin Kramer
Explicitly trun
c
a
te bsw
a
p operan
d
t
o
u
i
nt32
_
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Stephen
Boyd
gitweb
.
js: fix padLeftStr() a
n
d its usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Ja
k
ub
N
are
b
ski
gitweb
.
js:
Ha
r
den settin
g
b
l
ame
d
commit info
in incremental
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Nana
k
o Shir
a
i
sh
i
t1200: fix a timing depen
d
e
n
t error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio
C Hamano
M
erge
b
ra
n
ch 'rj/ma
i
n
t
-cyg
w
in-co
u
nt-objects'
commit
|
commitdiff
|
tree
2009-11-24
Christian Couder
Documentation:
u
pdate descriptions
of revision option
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Mar
t
in Storsjö
Enable support for IPv
6
on M
i
nGW
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Martin Stor
s
jö
Refactor
w
insock initialization into a separat
e
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Haman
o
M
erge b
r
anc
h
'rs/color-escape-
h
as-zero
-
w
id
t
h'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Hamano
Merge branch 'bg/a
p
ply-doc'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Hamano
Merge b
r
anch
'
mm/maint-hint-fail
e
d-merg
e
'
commit
|
commitdiff
|
tree
2009-11-24
J
u
n
i
o C Hamano
M
e
rge b
r
anch
'jc/log-s
t
din
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branc
h
'mr/gitweb-
s
napshot'
commit
|
commitdiff
|
tree
2009-11-24
Brian Gern
h
a
r
dt
t/gi
t
web-lib: Split HTTP r
e
sponse wi
t
h non-GNU sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C
H
aman
o
M
e
r
g
e branch 'cc/
r
ep
l
ace'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2009-11-24
Nicolas P
i
tre
p
ack-obje
c
ts
:
sp
l
it implications of --all-progress
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
St
e
phen Boyd
i
nstaweb: restart server if already run
n
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
J
e
ff King
pru
n
e-packed: only s
h
ow
prog
r
ess when stderr is a
tt
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Tay
Ray Chuan
rem
o
te-curl
.
c: fix r
p
c
_
ou
t
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Prote
c
t
s
c
ripted P
o
rcelains from G
R
EP_OPT
I
ONS insanity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René S
c
h
arfe
merge
t
ool-
-
lib: si
m
pl
i
fy guess_mer
g
e_too
l
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René
Scharfe
strbuf_add_wrappe
d
_text(): skip over colo
u
r codes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Joh
a
nnes Sixt
t
401
4
-format-pat
c
h: do not a
s
sum
e
'test' is availabl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Björn Gus
t
avsson
Fix over-simplified documentati
o
n for 'git log -
z
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
aman
o
Add trivial tests f
o
r -
-
stdin optio
n
t
o log f
a
mily
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C H
a
mano
Mer
g
e
b
ranc
h
'bg
/
fet
c
h-multi'
commit
|
commitdiff
|
tree
2009-11-23
Chris
t
ian Cou
d
er
bisect: si
m
plify calling visu
a
lizer
using '--b
i
sect
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Marti
n
Stor
s
jö
Disa
b
le CUR
L
O
PT_NOBODY before en
a
bling CURLOPT_PUT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Mat
t
hew Ogilvie
conf
i
g
documentati
o
n: some
c
on
f
igs are
auto
-
set by
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matthew Og
i
lvie
cvsserver doc:
d
at
a
base gen
e
r
ally ca
n
n
o
t be reprod
u
ced
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Ham
a
no
Gi
t
v1
.
6
.
6-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o C Hamano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2009-11-23
J
u
nio C Hama
n
o
Merge git://git
.
bogomips
.
or
g
/
git-svn
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ha
m
ano
Merge bra
n
ch 'th/maint-
r
emote-updat
e
-help-
s
tring'
commit
|
commitdiff
|
tree
2009-11-23
J
unio C
H
amano
Me
r
g
e br
a
n
ch
'
j
n
/
f
a
ster-complet
i
on-
s
tartup'
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o C Hamano
Merge branch 'rj/ma
i
nt-t
9
7
0
0'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Hamano
M
e
r
g
e
branch 'ls/m
a
int-mailinfo-n
o
-in
b
o
d
y'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Haman
o
Merge
b
ranc
h
'mo
/
m
a
int-crlf
-
d
oc'
commit
|
commitdiff
|
tree
2009-11-23
Junio C H
a
mano
Merge branch
'
th
/
r
e
m
ote
-
usage'
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o C Haman
o
M
e
rge branch 'pb/maint-use-
c
usto
m
-perl'
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o C Ham
a
no
M
erge branch 'mm/c
o
nfig-pa
t
hname-tilde-e
x
pand'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ha
m
ano
Merge branc
h
'bc
/
g
r
ep-i-F'
commit
|
commitdiff
|
tree
2009-11-23
J
un
i
o C Hamano
Merg
e
branch
'
j
k
/maint-b
r
eak-rename-reduce-m
e
mory'
commit
|
commitdiff
|
tree
2009-11-23
J
uni
o
C Hamano
Merge branch 'tc/format-attri
b
ute'
commit
|
commitdiff
|
tree
2009-11-23
J
uni
o
C Hamano
Merge
b
ra
n
ch '
t
r/maint-merge-o
u
rs-clarific
a
tion' (early
.
.
.
commit
|
commitdiff
|
tree
next