repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool-lib: fix default tool selection
2015-06-19
Michael J
G
r
u
ber
mergetoo
l
-lib: fi
x
default tool s
e
lection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
m
ergetools: add winmerge as a builtin
tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Dav
i
d
A
guil
a
r
m
e
rgetool--lib: set IFS for
d
i
fftool
a
n
d mergetoo
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Jun
i
o C Hamano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge branch
'
mh/multi
m
ail-renewal
'
commit
|
commitdiff
|
tree
2015-04-28
Junio C H
a
mano
Merge branch '
m
g
/
show-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
H
amano
Merge b
r
anch
'nd/versio
n
cmp-prerel
e
a
ses'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
H
a
mano
Merge b
r
anch 'mg/status-v-v'
commit
|
commitdiff
|
tree
2015-04-28
M
i
chael Haggerty
Upd
a
t
e
g
i
t-mul
t
im
a
il
t
o
v
ersion 1
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Haman
o
Sync
wit
h
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Hamano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C
Hamano
Merge branch 'tb/co
n
nect-ipv6-parse-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-04-27
J
un
i
o
C
Hamano
Merge bran
c
h 'ma/bash-completion-lea
k
in
g
-
x' into maint
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C
Ha
m
a
no
Mer
g
e
b
ra
n
ch
'jc/push
-
cert'
into maint
commit
|
commitdiff
|
tree
2015-04-24
Michael Haggerty
statu
s
:
d
o
c
ument the -v/--verbose option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
M
ichael Hag
g
e
r
ty
RelNotes
:
wor
d
s
m
ithing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
M
ichael Haggerty
R
elN
o
t
e
s
: r
e
fe
r
to
t
he
rebase -i "
t
o
d
o list", not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Michael Haggerty
Re
l
Notes: correct name of
versionsort
.
prerelease
S
uffix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Michael Haggerty
git tag: mention
versionsort
.
p
re
r
eleaseSuffix
i
n
manpage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Junio C Hamano
Git 2
.
4
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Haman
o
Sync with maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Git 2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
Hamano
Merge
b
ra
n
ch '
j
k/co
l
ors'
i
nto maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch '
j
k
/
t
e
s
t-ann
o
yances' into mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Hamano
Merge branch '
p
t/enter-repo-
c
omment-fix' into m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Hamano
Merg
e
branch '
j
z/
g
itweb-co
n
f
-
doc-fix' int
o
main
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C H
a
mano
Merge b
r
anch 'jk/cherry
-
pick-d
o
c
f
ix' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o
C Hamano
Merg
e
branch 'iu/
f
i
x
-
parse-option
s
-h-comment' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Hamano
M
erge branch
'jg
/
c
g
uid
e
-we-can
n
ot-count' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Merg
e
br
a
nch 'jk/pack-corruption-post-
m
o
r
tem' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C
Hamano
Merge branc
h
'
j
n/doc-f
a
st-import
-
no-1
6
-octop
u
s-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o
C
Hamano
RelNot
e
s: "merge --quiet" change
h
as been
r
everted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Haman
o
Hopefully
t
he last batch for 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io C Hamano
Merge bran
c
h 'ps/grep-help-all-callback-
a
rg'
commit
|
commitdiff
|
tree
2015-04-20
J
u
n
io
C Haman
o
Merge branch 'tb/co
n
nect
-
ipv6-parse-fix
'
commit
|
commitdiff
|
tree
2015-04-20
J
un
i
o C Hamano
Merge branch 'va/fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
J
u
ni
o
C Ham
a
n
o
Merge branch 'jc/push-
c
ert'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C
Hamano
Merg
e
branch '
m
a/bash-comple
t
io
n
-
l
eaking-x'
commit
|
commitdiff
|
tree
2015-04-19
J
unio C
H
amano
Merge tag '
g
itgui-0
.
20
.
0' of http://
r
epo
.
or
.
cz/r/git-g
u
i
commit
|
commitdiff
|
tree
2015-04-17
M
ichael J Grube
r
rev
-
list-
o
ptions
.
txt: complete senten
c
e
about
n
otes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Ham
a
no
Reve
r
t "merge:
pa
s
s verbosity f
l
ag down t
o
me
r
g
e
-recursive"
commit
|
commitdiff
|
tree
2015-04-14
J
unio C H
a
mano
G
it 2
.
4
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ham
a
no
Merge br
a
nch 'jk/colors'
commit
|
commitdiff
|
tree
2015-04-14
J
u
n
io C Hamano
M
erge
b
r
a
n
c
h 'jk/me
r
ge-qu
i
e
t'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
amano
Merge branch 'jk/pack-co
r
ru
p
tion-post-mo
r
te
m
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
M
erge b
r
a
nch 'jc/update-
i
nstead-into-
v
oid'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
M
e
rge bran
c
h 'sb/
p
lug-st
r
eaming-lea
k
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Me
r
g
e br
a
nch 'jn/doc-fast-import-no-16-octo
p
us-
l
imit'
commit
|
commitdiff
|
tree
2015-04-14
Junio C H
a
mano
Merge branch 'sb/plug-wt-shortstatu
s
-trackin
g
-leak'
commit
|
commitdiff
|
tree
2015-04-14
Junio C H
a
mano
Merge
b
ranch
'pt/enter-
r
ep
o
-
c
o
m
me
n
t-fix'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
Hamano
Merge branch 'jz/g
i
t
w
eb
-
conf-doc-f
i
x'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge
br
a
n
c
h
'jk/cherry-pick-docf
i
x'
commit
|
commitdiff
|
tree
2015-04-14
Jun
i
o C
Hamano
Merge branch 'iu/fix-pa
r
se-opti
o
ns-h-comment'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
i
o
C Hamano
Merge branch 'jg/cgui
d
e-we-cannot-count'
commit
|
commitdiff
|
tree
2015-04-14
Julian Gind
i
C
o
dingGuidelines: update
'
rough' rule count
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-13
Patrick
Stei
n
har
d
t
grep: correctl
y
init
i
alize help-all
o
p
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-13
Márc
i
o
Al
m
ad
a
comple
t
ion: fix global
bash
variable
l
e
ak on _
_
gi
t
c
o
mpappend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-13
Vitor
A
ntune
s
t9814: guaran
t
ee only
o
ne
s
ource exists i
n
git
-
p4 co
p
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-09
Junio C Hamano
Mer
g
e tag 'l10n-
2
.
4
.
0-rnd2'
o
f g
i
t://github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-04-09
Torst
e
n Böge
r
shausen
connect
.
c: ignore
extra col
o
n a
f
ter hostna
m
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-04
K
y
le J
.
M
c
Kay
diff-highlight: do not split multiby
t
e charac
t
e
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Jeff King
merge: pass verbosity
fla
g
down to m
e
rge-recursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
G
i
t
2
.
4
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio
C
Hamano
Merge
bra
n
ch 's
b
/at
o
mic
-
push'
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
push --signed: tighten what t
h
e receiving end can ask
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Ralf Thielow
send-pack: u
n
ify error m
e
ssages
for unsupporte
d
ca
p
abilities
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Jeff King
h
o
w
t
o: document
more t
o
o
l
s
f
o
r rec
o
ve
r
y
corrup
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hama
n
o
p
u
sh-
t
o-deplo
y
:
allow pushing
into an unborn branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-01
Jona
t
han Nieder
fa
s
t-import doc: remo
v
e
s
u
g
g
e
s
ted 16-pa
r
ent
li
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
io C
Hamano
Sync with 2
.
3
.
5
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Gi
t
2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio
C
H
amano
Merge bran
c
h 'ss
/
pull-reba
s
e-p
r
ese
r
ve' into maint
commit
|
commitdiff
|
tree
2015-03-31
J
u
nio C Hamano
M
erge branch 'jc/report-path-error-to-dir' into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Merge br
a
n
c
h 'ph/pus
h
-d
o
c-cas' into
m
aint
commit
|
commitdiff
|
tree
2015-03-31
Jérôme
Zago
gitweb
.
co
n
f
.
tx
t
: say "build-t
i
me", not "
b
uilt-tim
e
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Joh
n
Kee
p
i
n
g
st
r
eaming
.
c: fix a
m
emleak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
enter_repo(): fix
docs to
match code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Stefan
Bel
l
e
r
wt-st
a
tus
.
c: fix a
m
emle
a
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
J
eff
King
c
herry-pick:
fix d
o
cs describi
n
g
h
a
n
d
ling of empt
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-30
Sebastian
S
chuberth
docs
:
clarify
what
git-reb
a
se's "-p" /
"
--pr
e
se
r
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-30
Iv
a
n Uk
h
o
v
p
arse-options
.
h: OP
T
IO
N
_{BIT,S
E
T_INT} do
no
t
store
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ham
a
n
o
S
y
nc wit
h
maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
amano
RelNo
t
es: min
o
r doc
u
pda
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C H
a
mano
Merge
branch
'ph/push-doc-cas'
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Hama
n
o
Merge
branch
'
s
s
/pull-r
e
base-preserve'
commit
|
commitdiff
|
tree
2015-03-28
J
unio C Hamano
Prepare f
o
r 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
amano
Mer
g
e
bra
n
ch
'sg/c
o
mpletio
n
-g
i
t
comp-nl-for-refs' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ha
m
ano
Merge branch 'jk/sim
p
lify-csum-fil
e
-sha1fd-
c
heck'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
J
u
n
io
C Hamano
Merge
b
ran
c
h 'tg/tes
t
-index
-
v4' into maint
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hama
n
o
Mer
g
e
b
ranch 'nd/doc
-
git-in
d
ex
-
v
ersion' into maint
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hamano
M
erge branch 'ct/prompt-untracked-
f
ix
'
into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Mer
g
e branch 'ws/g
r
ep
-
quiet-no-pager' into
m
aint
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io C Hamano
Merge br
a
nch 'jc/
s
ubmitting-p
a
t
c
he
s
-mention-send-
e
m
ai
l
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Ha
m
an
o
M
e
rge br
a
nch 'jk/clean
u
p-f
a
i
led-clo
n
e' in
t
o maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge
br
a
n
c
h 'jk/fetch-pac
k
' into maint
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C
Hamano
Merge branch 'tg
/
fix-
c
heck-order-with-
s
p
l
i
t
-in
d
ex
'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge branch 'jk/prune-with-corrupt-refs' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Thomas
A
c
kermann
2
.
3
.
2 release
n
o
tes:
t
y
p
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C H
a
mano
Mer
g
e b
r
anch
'jn/doc-a
p
i-erro
r
s
'
commit
|
commitdiff
|
tree
2015-03-28
Thomas Ackerma
n
n
api-erro
r
-handling
doc:
typ
o
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next