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
Revert recent "git merge <msg> HEAD <commit>..." deprecation
2009-12-08
Junio C Hamano
Revert recent
"
git merge
<msg> HEAD <c
o
mmi
t
>
.
.
.
"
deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
S
Z
E
DER Gábo
r
bash: update
'
git commit' completion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jun
i
o C Ha
m
an
o
S
ync wit
h
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Hamano
G
i
t
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
L
i
nus To
r
vald
s
Fix diff -B/
-
-d
i
rstat miscounting
o
f
n
e
w
ly added c
o
n
t
e
nt
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
ef
f
King
reset: improve worktree
sa
f
ety valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
To
d
d
Zu
l
linge
r
Documentation: Avoid use
o
f xml
t
o
-
-s
t
r
i
n
gparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
R
e
n
é Scharfe
archive: c
l
arify de
s
cription of pat
h
paramet
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Je
f
f King
rerere: don't segf
a
u
lt on f
a
ilure to open rr
-
cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ham
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C Hamano
Prepare for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'uk/
m
aint-sho
r
tlog-en
c
o
d
ing'
int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
Merge branch 'fc/mai
n
t-format-pat
c
h-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Ha
m
ano
Merge branch 'ap/maint-merg
e
-strategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch
'jc/mai
n
t-am-keep' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hamano
Merge
branch 'rs/w
o
rk-aroun
d
-
g
rep-opt-insani
t
y' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'r
j
/maint-
c
yg
w
in-count-objects' i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge bra
n
ch 'mm/m
a
int-hint-
f
ai
l
ed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Mer
g
e b
r
anch 'th/mai
n
t-remote-update-
h
elp-string
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
Merge branch 'rj/maint
-
t970
0
' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge bra
n
c
h
'
ls
/
m
a
in
t
-
m
a
ilinfo-no-inbody'
i
n
t
o
main
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io
C Hamano
Merge branch '
m
o/maint-crlf-doc' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hamano
M
e
rge branch 'th
/
remote-usage' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h 'pb/maint-use-c
u
s
t
o
m
-p
e
rl' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
an
c
h
'
mm/co
n
fig-pathname-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 'bc/g
r
ep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Haman
o
Merge branch 'jk/maint-break-rename-reduce
-
m
e
mory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge
b
ranch 'rj/maint-simplify-
c
ygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'rg/doc-workflow'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C
H
amano
Merg
e
b
r
anch 'np/maint-sideband-favor-s
t
a
t
us'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Na
r
ebski
gitw
e
b: Describe (possible)
g
itwe
b
.
j
s
minif
i
cation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Document
a
tion: xmlto 0
.
0
.
18 does not
know --stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix crasher on
encountering SHA1
-
like non-
n
ote in
n
o
t
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
B
r
andon Case
y
t
9
001: use older Getopt::Long boo
l
ean prefix '--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Bran
d
o
n
Cas
e
y
t4201: use ISO88
5
9
-1 rath
e
r than ISO-8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge in
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Unc
o
nditionally
s
et man
.
b
ase
.
url
.
for
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
un
i
o
C Hama
n
o
G
i
t 1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ho
r
st H
.
von Bran
d
g
it
-
pull
.
sh: F
i
x call to git-merge for n
e
w command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
i
o C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
P
repare
f
o
r
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merge: do not add s
t
a
n
dard mes
s
age when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
i
o C H
a
mano
Do not misiden
t
ify "git
m
e
r
g
e
f
oo HEAD"
a
s an ol
d
-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
U
p
dat
e
draft release notes to 1
.
6
.
6 befo
r
e -r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Mer
g
e branch 'j
c
/deprecate-old-syntax-fr
o
m
-
me
r
ge'
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hamano
g
it-merge: a depre
c
ation n
o
t
i
ce of
t
h
e
a
ncient
c
ommand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hamano
Merge branch 'bw/r
e
mote-g
e
t-ref
-
states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert W
e
sarg
get_ref_states: strdup entrie
s
and fr
e
e ut
i
l
i
n
stale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguil
a
r
help: Do not
u
n
n
ecessarily
l
ook
f
or a repositor
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Micha
e
l J Gruber
Documentati
o
n: Fix a few i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
ni
o
C
H
amano
Merg
e
branc
h
'j
n
/gitweb
-
b
l
ame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Narebsk
i
gitweb:
Add link
t
o other blame implementat
i
o
n
i
n bl
a
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
a
kub
N
arebsk
i
gitwe
b
:
Make link
i
ng t
o
actions requiri
n
g J
a
vaSc
r
ipt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C
Hamano
M
e
r
ge branch 'fc/maint-f
o
rmat-patch-p
a
thspec-
d
a
shes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merge branch
'mm/maint-merge-ff-error
-
message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
H
amano
Merge
b
ra
n
ch
'ap/
m
aint-merge-strate
g
y-list-fix
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bra
n
ch 'jc/pret
t
y-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
M
e
rge
b
ranch '
c
c/bis
e
c
t
-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
no
Mer
g
e
br
a
n
ch 'em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Mer
g
e branch 'jc/mailinfo-remove-
b
rackets'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge bran
c
h
'fc/send-ema
i
l
-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Haman
o
Merg
e
b
r
anch 'uk/ma
i
nt-shortl
o
g-
e
nc
o
ding'
commit
|
commitdiff
|
tree
2009-11-30
J
un
i
o C
H
aman
o
Merge branch 'ns/
s
end-e
m
ail
-
no-chai
n
-rep
l
y-to'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o
C H
a
mano
Merge br
a
nch 'jc/m
a
int-am-kee
p
'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
Merge b
r
anch 'bw/diff-
c
olor-hunk-he
a
der'
commit
|
commitdiff
|
tree
2009-11-30
Davi
d
S
o
ria Parra
Documentation: Docum
e
n
t
--branc
h
option i
n
git c
l
one
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthie
u
Moy
builti
n
-merge: show user-friendly error messages for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
merge
-
recursive: make the error-message g
e
neration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
M
a
t
t
h
ew
O
gilvie
t
/RE
A
DME
:
D
o
c
u
m
ent GIT_TEST_INS
T
AL
L
ED a
n
d GIT_TES
T
_EX
E
C
_PATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Ma
t
thew Ogilvie
t
3
409 t
4
107 t740
6
t9150: use dashless commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Avery Pennaru
n
builtin-merg
e
.
c: call
e
x
clude
_
cmds()
c
o
r
r
e
ctly
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
M
atthew
O
gilvie
t230
0
: use documente
d
technique to invoke git-sh-set
u
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-29
Nanako Shiraishi
prepare sen
d
-ema
i
l
for smoo
t
her change of --ch
a
in-rep
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
J
u
nio C Ham
a
n
o
Update d
r
aft relea
s
e notes to 1
.
6
.
6 before merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
J
onathan N
i
eder
Makefile
:
do n
o
t clean arm
dire
c
t
or
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
B
ert
W
esa
r
g
Giv
e
t
he
h
unk c
o
m
me
n
t
i
t
s own c
o
l
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
F
e
l
i
pe Contreras
send-e
m
ail:
a
uto
m
at
i
c
en
v
elope sender
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
emit_line(): do
n
'
t
e
mit a
n
e
mpty <
S
ET><RESET> followe
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C
Hama
n
o
Remove dead code from "git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Juni
o
C H
a
m
ano
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2009-11-27
Johanne
s
S
i
xt
Add a
n
otice that only
certain
f
un
c
tions can print
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Felipe
Contr
e
r
a
s
format
-
patch: ad
d
test for parsing of "
-
-"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
F
e
li
p
e C
o
ntreras
format-patch: fix parsi
n
g of "--" on th
e
command li
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
builtin-
a
pply
.
c
: pa
y
attention t
o
-p<n> when
d
ete
r
m
i
n
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Björn Gusta
v
s
son
gitworkflows: Con
s
istently
back-quote git commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Uwe K
l
eine-König
shortlog: respect commit
e
n
codi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Hamano
Merge b
r
a
n
ch 'rs
/
work-around-grep-opt-insan
i
ty'
commit
|
commitdiff
|
tree
2009-11-25
Be
n
j
a
min Kramer
Explici
t
ly truncate bswap opera
n
d
t
o
uint
3
2_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Stephen
Boyd
gitweb
.
js: fix padLef
t
S
t
r() and
i
ts
u
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
J
a
ku
b
Narebski
gitweb
.
js: Hard
e
n setting b
l
amed commit info in
i
n
cr
e
mental
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Nanako Shiraishi
t1200: fix a
timi
n
g dependent error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Hamano
Merge b
r
anc
h
'
r
j
/
maint-cygwin-c
o
unt-objects'
commit
|
commitdiff
|
tree
2009-11-24
Ch
r
i
st
i
an Couder
D
o
cumentati
o
n:
update descriptions o
f
r
e
vision op
t
ions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Martin Storsjö
Enable su
p
port for IPv6 on
Min
G
W
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Martin Sto
r
sjö
Refactor wi
n
s
ock init
i
alization into
a
sepa
r
ate fun
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Ha
m
ano
Merge branch 'rs/co
l
o
r-escape-has-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ham
a
n
o
Merge branch '
b
g/ap
p
ly-do
c
'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Hamano
Mer
g
e
b
r
a
nch 'mm/mai
n
t-h
i
nt
-
f
a
iled-merge'
commit
|
commitdiff
|
tree
next