repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-pull.sh: Fix call to git-merge for new command format
2009-12-02
Horst H
.
von Brand
git-pul
l
.
sh:
Fix c
a
ll to git-
m
erge
fo
r
ne
w
co
m
mand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
i
o
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 Ha
m
ano
merge: do not
add
stan
d
ard message when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio
C Ha
m
ano
Do no
t
misi
d
enti
f
y
"
git
m
e
rge fo
o
HEAD" as
an old-sty
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C
Ham
a
no
U
pd
a
te draft release not
e
s to 1
.
6
.
6
b
efore -rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
no
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
Merge branc
h
'jc
/
deprecate-old-syntax-from-
m
erge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
a
m
a
n
o
git-
m
erge: a
d
epr
e
cation
n
o
tice of
t
he ancient com
m
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
u
n
io
C Ham
a
no
Merge bran
c
h 'bw/
r
e
m
ote
-
get-r
e
f-st
a
t
e
s-fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesarg
get_ref_state
s
:
st
r
dup entries and free
u
til i
n
st
a
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
ilar
help: D
o
not unnec
e
ssari
l
y
lo
o
k for a rep
o
sitory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
D
o
cument
a
ti
o
n: F
i
x
a
f
ew i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
rge branch 'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-12-01
J
akub Na
r
ebsk
i
gitweb: Add link to
other b
l
ame imple
m
entation
i
n
blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jaku
b
Na
r
ebski
g
i
tweb
:
Make linking t
o
actions requirin
g
J
a
vaS
c
ript
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Merge branc
h
'f
c
/maint-format-patch-pathspec
-
das
h
es'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Merge
branch 'mm/m
a
int-merge-ff
-
error-message-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
Hamano
Merge branch
'
a
p/maint-me
r
ge
-
s
t
rategy-list
-
fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merg
e
b
r
a
nch
'
jc/
p
retty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hamano
Merge
branch '
c
c/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Haman
o
Merge br
a
nch 'em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
M
e
rge
b
ranc
h
'jc/mail
i
nf
o
-re
m
ove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Mer
g
e branch
'
fc/send-email-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C
Ha
m
a
no
M
erge branch 'uk/maint
-
shortlog-
e
n
c
o
d
ing'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
Merge bra
n
ch '
n
s/send-ema
i
l-no-cha
i
n-reply-to
'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o C Hama
n
o
M
e
rge branch '
j
c/maint-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
Me
r
ge branch 'b
w
/diff-col
o
r-hunk-he
a
der'
commit
|
commitdiff
|
tree
2009-11-30
David Sor
i
a
Parra
Documentation: Docume
n
t --b
r
anch
option in git
clone
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matt
h
i
eu Moy
builtin-merge: sho
w
user-
f
riendl
y
error message
s
fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
merge-rec
u
rsive: m
a
ke th
e
error-
m
essage gener
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthew O
g
ilvi
e
t/REA
D
M
E: Docum
e
nt
GI
T
_TEST_INSTAL
L
ED and GIT_
T
EST_EXEC_PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matt
h
ew O
g
ilvi
e
t3409
t4107
t
7406 t915
0
:
use dashless commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Av
e
ry Pe
n
na
r
un
bui
l
tin-merge
.
c:
call exclude
_
cmd
s
() correctl
y
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthew Og
i
lvie
t
2300: us
e
d
ocumented t
e
chnique
t
o
i
nvoke
g
it-sh-setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-29
Nanako
Shiraishi
pre
p
are se
n
d
-emai
l
for smoother ch
a
nge of
--chain-r
e
ply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio
C
Hamano
Updat
e
draft rele
a
se
notes to 1
.
6
.
6 before me
r
g
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Jon
a
t
han Nieder
Makefi
l
e: do not clean
a
rm directo
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Be
r
t Wesarg
Give the hunk
com
m
ent
i
t
s
o
wn
c
olor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Felip
e
Contreras
send-email: automatic en
v
elo
p
e
s
ende
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
J
uni
o
C
Hamano
em
i
t_line
(
): don't emit an em
p
ty <SET><RESET
>
followed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
unio C H
a
ma
n
o
Remov
e
dead code from
"
git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
J
o
hanne
s
Six
t
Add a noti
c
e
that
o
nly
c
ertain
f
unctions can pri
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contreras
fo
r
mat-patc
h
: add test for p
a
rsing of "-
-
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Con
t
re
r
as
for
m
at-patch:
f
i
x parsing of "--" on the co
m
mand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio C Ham
a
no
bu
i
lti
n
-apply
.
c:
p
a
y
a
ttentio
n
to -p<n> when determining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
B
jörn Gu
s
tavsson
gitworkflows: Consistent
l
y
back-quote
g
it co
m
mands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
U
we
K
le
i
ne-König
shortlog: respect com
m
it enc
o
ding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Hamano
Merge bra
n
c
h
'
r
s/work
-
around-
g
rep-o
p
t-insani
t
y'
commit
|
commitdiff
|
tree
2009-11-25
Benjamin Kramer
Expli
c
i
t
l
y
t
runcate bswap
o
p
era
n
d to uint32_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
S
tephen Boyd
gitw
e
b
.
js
:
fix
padL
e
ftStr() an
d
its
usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
J
akub Narebski
g
i
tweb
.
j
s
:
H
arden setting bl
a
med
commi
t
in
f
o in
i
ncre
m
ental
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Nan
a
k
o
Shir
a
ishi
t1
2
00: fix
a t
i
m
i
ng dep
e
ndent error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C
H
a
mano
Mer
g
e
b
r
anch 'rj/maint-cygw
i
n-coun
t
-objects'
commit
|
commitdiff
|
tree
2009-11-24
Chr
i
stian Co
u
d
er
Documentation: update
d
escr
i
ptio
n
s of revi
s
i
on option
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Martin Stor
s
jö
Ena
b
le suppo
r
t for IPv6 on
MinGW
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Martin
S
torsjö
Refactor w
i
nso
c
k initializat
i
o
n
into
a
s
eparate
f
unc
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
Merge bra
n
c
h
'
r
s/color-escape-has-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
M
e
rge branch 'bg/apply-doc'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
H
amano
Merge
branch 'm
m
/main
t
-hint-fail
e
d
-mer
g
e'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'jc/log-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
Hamano
Merg
e
b
r
anch 'mr/gitweb-snapsho
t
'
commit
|
commitdiff
|
tree
2009-11-24
B
r
ian Gernhardt
t
/gitweb
-
lib: Split HTTP respo
n
s
e
w
ith non
-
GNU
s
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Hamano
Merge br
a
n
ch 'cc/re
p
lace'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-11-24
Ni
c
olas Pitre
pack
-
obje
c
ts: split
i
mpl
i
catio
n
s of --all
-
progres
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Stephen
B
oyd
instawe
b
: restart server if alr
e
ady running
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jef
f
King
p
r
une-packed: onl
y
show
progr
e
ss whe
n
stderr is a tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Tay
Ray Chuan
remote
-
curl
.
c: fi
x
rpc_out()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
P
r
otect scri
p
ted Porcelains
f
rom GREP_OPTION
S
i
nsanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
R
e
né Scharf
e
mergetool--lib: si
m
plify g
u
ess_
m
erge_tool()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
R
en
é
Scha
r
fe
strbuf_add_wra
p
ped_tex
t
():
skip
over colour c
o
des
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Johannes
S
i
xt
t40
1
4-forma
t
-patch
:
do not assume 'test'
i
s availa
b
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Björn
G
u
stavs
s
on
F
i
x over-s
i
mpl
i
fie
d
docu
m
e
ntation for
'git log -
z
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Hamano
Add tri
v
i
a
l
tests for --
s
t
d
in op
t
io
n
to log fam
i
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
i
o
C Ha
m
ano
Merge
branch 'bg/fetch-multi'
commit
|
commitdiff
|
tree
2009-11-23
Christ
i
an Coude
r
bisect: simplify calling
visual
i
ze
r
using '--bisect
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Martin Storsjö
Disab
l
e CURLO
P
T_NOBODY before
enabling CURLOPT_PUT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
M
a
t
th
e
w Ogil
v
ie
conf
i
g doc
u
mentati
o
n: some con
f
igs
a
re auto-set
b
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthe
w
Ogilvie
cvsserver doc
:
d
a
tabase generally
c
an
not be
r
epr
o
duced
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Hamano
Git v1
.
6
.
6
-rc
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
J
u
n
i
o C Hamano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2009-11-23
Junio C H
a
mano
Merge git:
/
/git
.
bogomips
.
org/
g
it
-
svn
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Haman
o
M
erge branch
'th/maint-remote-update
-
h
e
l
p
-
string'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch 'jn/faster-completi
o
n
-
st
a
rt
u
p
'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Ham
a
no
Merge branch 'rj/
m
aint-t9700'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch
'ls
/
maint-m
a
ilinfo-n
o
-i
n
body'
commit
|
commitdiff
|
tree
2009-11-23
J
u
n
io C Hamano
Merge branch 'm
o
/
m
aint-crl
f
-doc'
commit
|
commitdiff
|
tree
2009-11-23
J
u
nio C Hamano
Merge
branch 'th/
r
emote-u
s
a
g
e
'
commit
|
commitdiff
|
tree
2009-11-23
J
un
i
o C
H
aman
o
Merge branc
h
'pb/
m
aint-us
e
-cust
o
m-per
l
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ha
m
ano
Merge branch '
m
m/config-pathname-tilde-expan
d
'
commit
|
commitdiff
|
tree
2009-11-23
J
unio C Hamano
M
erge bran
c
h 'bc/
g
rep-i-F'
commit
|
commitdiff
|
tree
2009-11-23
J
u
nio C
Haman
o
Merge br
a
n
c
h
'j
k
/maint
-
break-rename-reduce-memory'
commit
|
commitdiff
|
tree
2009-11-23
J
u
n
io C Hamano
Merge branch 'tc/f
o
rma
t
-
attribute'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Haman
o
Me
r
ge branch 'tr
/
m
a
int-merge-ours-
c
larifi
c
ation' (early
.
.
.
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
l
og --
f
or
m
at: document %w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René
Sc
h
ar
f
e
strbuf_add_wrapped_te
x
t():
f
actor
out
strbuf
_
add_inden
t
ed_tex
t
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
R
e
né Scharfe
gre
p
: un
s
et
G
REP_O
P
TIONS before spawning
external
g
rep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Björn G
u
stavsson
U
ser Manu
a
l: Write "
G
i
t
" inste
a
d of "
G
IT"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next