repo.or.cz
/
git
/
gitster.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-strategies: avoid implying that "-s theirs" exists
2017-09-25
J
unio C H
a
mano
merge-strat
e
gies: avoid implying that "-s
theirs" exists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
Git 2
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Haman
o
Merge tag
'
v2
.
9
.
5'
i
nto maint-2
.
10
commit
|
commitdiff
|
tree
2017-07-30
Jun
i
o C Hamano
Git 2
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
Merg
e
tag 'v2
.
8
.
6' into ma
i
nt-2
.
9
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
Gi
t
2
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio
C Hamano
Merge tag 'v2
.
7
.
6'
i
n
t
o
ma
i
nt-2
.
8
commit
|
commitdiff
|
tree
2017-07-30
Junio
C
Ha
m
ano
Git 2
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Ju
n
io
C Hama
n
o
M
e
rge branc
h
'jk/ssh-fu
n
ny-url'
i
nto maint-2
.
7
commit
|
commitdiff
|
tree
2017-07-28
J
e
ff King
connect: reject paths that
look li
k
e command
line op
t
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
J
ef
f
King
c
onnect: reject dashed argum
e
n
t
s
for prox
y
c
o
mmands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Jeff King
c
o
nnect: factor out "looks
l
ike
c
ommand line option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Je
f
f
King
t58
1
3: add test f
o
r hostname starting with dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Junio C Hamano
connect: reject ssh
h
ostname that beg
i
ns
with
a dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-05-05
Ju
n
io
C Haman
o
Git 2
.
10
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-05-05
Junio
C Haman
o
Merge b
r
anch 'ma
i
n
t
-
2
.
9' into maint-2
.
10
commit
|
commitdiff
|
tree
2017-05-05
J
un
i
o C H
a
mano
Git 2
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-05-05
J
unio C
H
amano
M
erge branch 'main
t
-2
.
8' i
n
to
m
ain
t
-2
.
9
commit
|
commitdiff
|
tree
2017-05-05
Junio
C
Ha
m
ano
G
i
t 2
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-05-05
Junio C
H
amano
Merge branch 'maint-2
.
7' into maint-2
.
8
commit
|
commitdiff
|
tree
2017-05-05
Junio C Haman
o
G
it 2
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-05-05
Junio C Hamano
Merge
branch 'maint-2
.
6' int
o
maint-2
.
7
commit
|
commitdiff
|
tree
2017-05-05
Junio
C
Hamano
G
it 2
.
6
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-05-05
Juni
o
C Hamano
Mer
g
e
branc
h
'maint-2
.
5'
i
nto ma
i
nt
-
2
.
6
commit
|
commitdiff
|
tree
2017-05-05
Junio C Hamano
Git
2
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-05-05
J
u
nio C
H
amano
M
e
rge branch 'maint
-
2
.
4' into
ma
i
nt-2
.
5
commit
|
commitdiff
|
tree
2017-05-05
Junio
C
Hamano
Git 2
.
4
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-05-05
Jun
i
o C
H
amano
Me
r
g
e
branch 'jk/shell-
n
o
-reposi
t
or
y
-that-begins
-
with
.
.
.
commit
|
commitdiff
|
tree
2017-05-05
J
e
ff Ki
n
g
s
h
ell: disal
l
ow repo n
a
mes beginning with dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Ju
n
io
C
Haman
o
p
r
epar
i
ng for 2
.
10
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
J
u
nio C Haman
o
M
erge branch 'jk/co
m
m
o
n
-main' into maint-2
.
10
commit
|
commitdiff
|
tree
2016-11-29
J
unio C
Haman
o
Mer
g
e branch 'tk/dif
f
core-delt
a
-
remov
e
-
u
nuse
d
' into
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
J
u
nio C
H
amano
M
erge
b
ranc
h
'jk/cre
a
te-br
a
nch-re
m
ov
e
-u
n
used-param
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Junio C Haman
o
Merge branch
'nd/workt
r
e
e
-loc
k
'
i
nto maint
commit
|
commitdiff
|
tree
2016-11-29
Juni
o
C Ham
a
no
Merge br
a
nch
'
ps/common-inf
o
-doc' into maint
commit
|
commitdiff
|
tree
2016-11-29
Jun
i
o C Hamano
Merge branch 'rs/coc
c
i' i
n
to maint
commit
|
commitdiff
|
tree
2016-11-29
Junio C Hamano
Merge br
a
nch 'nd/test-helpers' into maint
commit
|
commitdiff
|
tree
2016-11-29
Junio C Hamano
Me
r
ge
b
ranch 'sc/fmt-m
e
rg
e
-msg-doc-markup-fix
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Juni
o
C Hama
n
o
Merge
b
ran
c
h 'rs/co
m
mit-pptr-simp
l
i
f
y' int
o
main
t
commit
|
commitdiff
|
tree
2016-11-29
Junio C Ham
a
no
M
e
r
g
e
branch 'jk/reba
s
e-config-insn-fmt-docfix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Jun
i
o
C
H
a
mano
Merg
e
b
r
anch 'ak/p
r
e-receive-ho
o
k-t
e
m
p
l
at
e
-
m
odefix
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Junio C Hamano
M
er
g
e br
a
nc
h
'
ls/ma
c
os-update' into maint
commit
|
commitdiff
|
tree
2016-11-29
Jun
i
o C Hamano
Merg
e
b
r
anch 'as/merg
e
-a
t
tr-sleep' into maint
commit
|
commitdiff
|
tree
2016-11-29
Junio
C
Hamano
M
e
rge branch 'a
k
/
s
h
-
setup
-
do
t
-
s
our
c
e-i18n-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Jun
i
o C H
a
man
o
Merge branch 'jk
/
daemon-p
a
th-ok-chec
k
-truncati
o
n
' into
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
J
u
nio C H
a
mano
Merge branch 'rs
/
ring-buffer-w
r
ap
a
r
o
u
nd' into ma
i
nt
commit
|
commitdiff
|
tree
2016-11-29
Junio C
H
amano
Merge
b
ranch 'm
m
/send-email-cc-cruft
-
a
fter
-
ad
d
r
e
ss
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Junio C Hamano
Mer
g
e branch 'c
p
/completion-negat
i
ve-r
e
fs' int
o
maint
commit
|
commitdiff
|
tree
2016-11-29
Junio
C
Hamano
M
erge b
r
a
n
ch
'
jc/am-rea
d
-author-fil
e
'
i
nto maint
commit
|
commitdiff
|
tree
2016-11-29
Jeff King
common-main: st
o
p
munging
a
rgv[0] path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-14
To
b
ias Klauser
diffco
r
e-delta: remove unused parameter
to dif
f
core_count_c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-14
Ben North
git-worktree
.
txt: fix ty
p
o "
t
o"/"two", and
a
dd comma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-11
J
o
hannes Sixt
t6026: clarify the p
o
i
nt of "kill
$
(
c
at sleep
.
pid)"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-11
Patrick Steinhardt
doc: fix locat
i
on
o
f 'info/' with $GIT_COMMON_DIR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-10
Joh
a
nnes Sc
h
ind
e
lin
t6026: ens
u
r
e
tha
t
long-running s
c
ript
re
a
lly
is
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-10
J
u
nio C Hamano
Re
v
ert
"t6026-
m
erge-
a
t
tr
:
don't fail
i
f
slee
p
exits
.
.
.
commit
|
commitdiff
|
tree
2016-11-10
Junio C Hamano
Revert
"t6026-me
r
ge-attr:
e
nsure
t
hat the merge
d
river
.
.
.
commit
|
commitdiff
|
tree
2016-11-10
Andreas
S
chwab
t6026-me
r
ge-attr: ensure t
h
at the mer
g
e driv
e
r
was
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-10
La
r
s Schneider
t
ravis-ci: disable GIT_TEST_HTTPD for
m
acOS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-10
Lar
s
Schneider
Ma
k
efile: set NO_OPE
N
SSL
on macOS
by default
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-09
Je
f
f King
c
r
eate_branch
:
drop unus
e
d "head" p
a
rameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-01
Re
n
é Sc
h
arfe
coc
c
i: avoid self-referenc
e
s
in object_
i
d t
r
ansfo
r
mation
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-30
Ander
s
Kaseorg
git-sh-se
t
up: be e
x
plicit whe
r
e t
o
dot-
s
ource g
i
t-sh
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-30
Ren
é
Sch
a
rfe
commit: simplify bui
l
ding p
a
rents
l
ist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-30
J
e
f
f Ki
n
g
doc
:
fix missing
"
:
:" in config
l
ist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-28
Anders Kaseo
r
g
p
r
e
-
receive
.
sample: mark
i
t
e
xecut
a
bl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-28
J
unio C Hamano
Git 2
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-28
Junio
C Hamano
Merge
b
ranch
'pb/test-parse-options-expect' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2016-10-28
J
u
nio C Hamano
Merge bra
n
c
h
'
j
c
/cocci-xstrdup-o
r
-
n
ull
'
into maint
commit
|
commitdiff
|
tree
2016-10-28
J
u
nio C Hamano
Merge br
a
nch 'rs/cocci
'
into
maint
commit
|
commitdiff
|
tree
2016-10-28
Jun
i
o
C Hamano
Merge
br
a
nch
'jc/diff-uni
q
ue
-
abb
r
ev-comme
n
ts' into
.
.
.
commit
|
commitdiff
|
tree
2016-10-28
J
unio C Haman
o
M
erge branch
'rs/pretty-format
-
colo
r
-doc-
f
i
x'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2016-10-28
Junio
C Haman
o
Merge
b
r
anch 'js/res
e
t-usag
e
' into m
a
int
commit
|
commitdiff
|
tree
2016-10-28
Junio C
H
amano
Merge branch
'po/fix-doc
-
merge-base-il
l
ustration'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2016-10-28
Junio C Haman
o
M
erge branch 'jk/t
a
p-verbose-fi
x
' into maint
commit
|
commitdiff
|
tree
2016-10-28
Junio C Hamano
Merge b
r
anch 'tg/add-chmod+x-fix
'
into
maint
commit
|
commitdiff
|
tree
2016-10-28
Junio C
Hamano
Merge branc
h
'bw/s
u
bm
o
d
ule-
b
ranch
-
dot-doc
'
into maint
commit
|
commitdiff
|
tree
2016-10-28
Ju
n
io C H
a
mano
Merge br
a
nch 'jk/tighten-alloc' int
o
maint
commit
|
commitdiff
|
tree
2016-10-28
J
u
nio C Haman
o
Merge
branch 'jk/fet
c
h-q
u
ick-tag-following' into maint
commit
|
commitdiff
|
tree
2016-10-28
J
u
nio C Haman
o
Merge br
a
nch
'
jk/m
e
rge-base-fork-point-wi
t
hout-reflog
.
.
.
commit
|
commitdiff
|
tree
2016-10-28
Junio C
H
am
a
n
o
Merge branch 'dk/wor
k
tree-d
u
p-checkout-
w
ith-bare-
i
s
.
.
.
commit
|
commitdiff
|
tree
2016-10-28
Junio C Hamano
Me
r
ge b
r
a
n
ch 'sb/submodule-con
f
ig-doc-drop-pat
h
'
into
.
.
.
commit
|
commitdiff
|
tree
2016-10-28
J
unio C H
a
mano
Me
r
ge
b
ranch 'jk/ref-
s
yml
i
nk-loop' into main
t
commit
|
commitdiff
|
tree
2016-10-28
J
u
n
io C Hamano
Merge b
r
anch 'nd/commit-p-doc' into maint
commit
|
commitdiff
|
tree
2016-10-28
J
u
nio C Hamano
M
e
rge bra
n
ch 'j
k
/clone
-
c
o
py-
a
lte
r
nates-fix' into m
a
int
commit
|
commitdiff
|
tree
2016-10-28
J
unio C
H
amano
Merge branch 'dt/htt
p
-empty-aut
h
' into maint
commit
|
commitdiff
|
tree
2016-10-28
Junio C
Hamano
M
erge bra
n
ch '
d
p/autoc
o
nf-curl-ssl' into ma
i
nt
commit
|
commitdiff
|
tree
2016-10-28
Junio
C
Ham
a
no
Merge b
r
anc
h
'ak
/
curl-imap-send
-
explicit-scheme' into
.
.
.
commit
|
commitdiff
|
tree
2016-10-28
Junio C Ha
m
ano
Mer
g
e branch 'jt/fetc
h
-pack-i
n
-va
i
n-co
u
nt-with-stateless
.
.
.
commit
|
commitdiff
|
tree
2016-10-28
Junio
C Hama
n
o
Merge br
a
nch 'js/re
g
exec-buf' in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2016-10-28
Junio C
H
amano
Merge bra
n
ch 'rs/c-auto-r
e
sets-att
r
ibutes' into m
a
int
commit
|
commitdiff
|
tree
2016-10-28
Ju
n
io C Haman
o
Merge bra
n
ch 'yk/git-tag-remove-menti
o
n-o
f
-old-l
a
you
t
.
.
.
commit
|
commitdiff
|
tree
2016-10-28
Stefan Chr
i
s
t
Doc
u
mentation/fmt-
m
erge
-
msg: fix m
a
rkup in example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-28
Ren
é
S
charfe
valgrind: support test
h
elpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-27
Je
f
f King
git-compat-util: move content inside ifdef/endif guards
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-26
Ren
é
Scharfe
hex: make
wraparou
n
d of
th
e
index into ring-
b
uff
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-25
Phil
i
p O
a
kley
doc: fix the 'revert
a fau
l
t
y
m
er
g
e' ASCII art tab
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-24
Jeff King
daemon: detect
a
nd rej
e
ct too
-
long
p
a
ths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-24
J
e
ff
K
ing
test-
l
ib: b
a
i
l out when
"
-v" u
s
ed und
e
r "p
r
ove"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-10-21
Jeff King
trav
i
s: use --verbose-log tes
t
opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next