repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7605: add a testcase demonstrating a bug with trivial merges
2016-04-13
Elijah Newren
t7605: a
d
d a testcase demonstrating
a
bug
w
ith trivial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-08
Jun
i
o C H
a
mano
Third
b
a
t
ch
f
or p
o
st 2
.
8
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-08
Juni
o
C Ham
a
no
Merge br
a
n
c
h 'ss/msv
c
'
commit
|
commitdiff
|
tree
2016-04-08
Jun
i
o C Ha
m
a
no
Me
r
ge branch 'oa
/
doc-diff-
c
he
c
k'
commit
|
commitdiff
|
tree
2016-04-08
Junio C
H
amano
Merge b
r
anch
'
pb/opt-cmdmode-doc'
commit
|
commitdiff
|
tree
2016-04-08
Ju
n
io C
H
amano
Mer
g
e b
r
anch 'nd
/
apply-report-skip'
commit
|
commitdiff
|
tree
2016-04-08
Junio C Hamano
M
er
g
e
b
ranch '
n
d/apply-doc'
commit
|
commitdiff
|
tree
2016-04-08
Juni
o
C Hamano
Merge
b
ranch 'jc/merge-refuse-new
-
ro
o
t
'
commit
|
commitdiff
|
tree
2016-04-06
Junio
C Hama
n
o
Se
c
ond b
a
tc
h
for post 2
.
8 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Junio C Ha
m
ano
Merge branch 'la/t
a
g-force-si
g
ning-a
n
notate
d
-tags'
commit
|
commitdiff
|
tree
2016-04-06
Junio
C
H
aman
o
Merge bra
n
ch 'jk/
s
ubmo
d
ule-c-cre
d
ential'
commit
|
commitdiff
|
tree
2016-04-06
Juni
o
C
Ha
m
a
no
M
e
rge branc
h
'jv/merge-nothing-into-void'
commit
|
commitdiff
|
tree
2016-04-06
J
un
i
o C
H
amano
M
e
rge branch 's
s
/c
o
mmit-squash-msg
'
commit
|
commitdiff
|
tree
2016-04-06
Junio
C
H
amano
Merge branch 'sb/re
b
ase-x'
commit
|
commitdiff
|
tree
2016-04-06
Junio C Hama
n
o
Merge branch 'jk/test-
h
ttpd-confi
g
-
n
osystem'
commit
|
commitdiff
|
tree
2016-04-06
Junio C Hamano
Merge branc
h
'jk/send-email-rtrim-mailrc-a
l
ias'
commit
|
commitdiff
|
tree
2016-04-06
Junio
C
Hamano
M
e
rge branch 'jk/
c
r
e
dential-cache-
c
omment-
e
xit'
commit
|
commitdiff
|
tree
2016-04-06
Ju
n
io C Ha
m
ano
Merg
e
branch 'sb/
c
lo
n
e-t
5
7
-t56'
commit
|
commitdiff
|
tree
2016-04-06
Ju
n
io C H
a
mano
M
e
rg
e
branch 'ls/p4-m
a
p-user'
commit
|
commitdiff
|
tree
2016-04-06
J
uni
o
C Hamano
M
erg
e
branch 'cc/doc-recom
m
end-perf
o
rma
n
ce-trace-to
.
.
.
commit
|
commitdiff
|
tree
2016-04-06
Jun
i
o C Hamano
Merge branch 'p
b
/t7502-dr
o
p
-
dup'
commit
|
commitdiff
|
tree
2016-04-06
Junio C Hamano
Mer
g
e branc
h
'd
a
/merge
t
ool-de
l
ete-
d
e
lete-co
n
f
l
ict'
commit
|
commitdiff
|
tree
2016-04-06
Junio C Hamano
Merge
b
ranch 'sb/sub
m
odule-parallel-update'
commit
|
commitdiff
|
tree
2016-04-06
Junio C Hamano
Merge branch 'ss/receive-pac
k
-parse-optio
n
s'
commit
|
commitdiff
|
tree
2016-04-06
Jun
i
o C
Hamano
Merge branch 'ss/exc-flag-is-a-collection-of-b
i
ts'
commit
|
commitdiff
|
tree
2016-04-03
J
u
n
io C Hamano
F
i
rst batch for
p
ost 2
.
8
cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-03
J
unio
C Ham
a
no
Sy
n
c with
G
it 2
.
8
.
1
commit
|
commitdiff
|
tree
2016-04-03
Junio C Hamano
Merg
e
bran
c
h 'jk/star
t
up-info
'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Haman
o
Mer
g
e
branch
'
e
s
/
t
e
s
t-gpg-tags'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Hama
n
o
Merge b
r
anch 'jk
/
getwholel
i
ne-getdelim-e
m
pty'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Hamano
M
erge bra
n
ch 'rj/xdiff-prepare-plug
-
l
e
ak-on-e
r
ror-
c
odepath'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Haman
o
Merge branch 'jc/index-p
a
ck'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Ha
m
ano
Merge branch 'gf/fetch-pac
k
-direct-obj
e
ct-fetch'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Hamano
Merge
branch '
j
c/ma
i
n
t
-index-pack-k
e
ep'
commit
|
commitdiff
|
tree
2016-04-03
Ju
n
io C Ham
a
no
Merge branch 'mm/lock
f
ile-er
r
or-m
e
ssag
e
'
commit
|
commitdiff
|
tree
2016-04-03
Junio C
H
amano
Merge branch 'jk/r
e
v-
p
arse-
l
ocal-en
v
-var
s
'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Hamano
Merge bran
c
h 'jk/conf
i
g-get-urlmatch'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Ha
m
ano
Merg
e
b
ra
n
c
h
'jk/add-i-high
l
ight'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Haman
o
Merge branc
h
'jk/credential-clear-conf
i
g'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Hamano
Merge branch
'mp/upload
-
pack-use-embedded-ar
g
s'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Ha
m
an
o
Merg
e
branc
h
'mm/diff-re
n
ames-default'
commit
|
commitdiff
|
tree
2016-04-03
Juni
o
C H
a
mano
Merge branch '
m
m/readme-markdown'
commit
|
commitdiff
|
tree
2016-04-03
Junio C Hamano
Gi
t
2
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-03
Junio C Hamano
Merge
b
ranch 'mm/rea
d
me-markdown'
i
nto maint
commit
|
commitdiff
|
tree
2016-04-03
Matthieu Mo
y
README
.
md: don
'
t take '
c
omm
a
ndname' literally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-03
Matthieu Moy
g
it
.
spe
c
.
in:
use R
E
ADME
.
md,
n
ot READM
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-30
Sven Strickr
o
th
MSVC: use shipped
he
a
ders instea
d
of fa
l
lback defini
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-30
Sven Strickroth
MSVC: vsnprintf
in
V
i
sual Studio 2015 doesn'
t
need
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-29
O
r
i A
v
t
al
i
on
Documenta
t
ion: git diff --check de
t
ects c
o
nflict markers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-28
Junio C H
a
m
a
no
Git
2
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-25
Pranit Bauva
api-
p
a
r
se-options
.
txt: document
OPT_CM
D
MODE()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-24
Junio C Hama
n
o
Merge bran
c
h 'ls/p4-d
o
c-markup'
commit
|
commitdiff
|
tree
2016-03-24
Junio
C
Ham
a
no
Merge
b
ranch 'js/mingw-t
e
s
ts-2
.
8'
commit
|
commitdiff
|
tree
2016-03-24
Jun
i
o C Hamano
Merg
e
b
r
anch 'sb/su
b
module-mod
u
l
e
-list-p
a
thspec-fix'
commit
|
commitdiff
|
tree
2016-03-24
Nguyễn Thái Ngọc
Duy
apply
:
report patch skipping i
n
verbose mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-24
Nguyễn Thái Ng
ọ
c Duy
g
i
t-apply
.
txt: mention the behavi
o
r
i
nsid
e
a s
u
bdir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-24
Nguyễ
n
Th
á
i Ngọc
D
uy
g
i
t-apply
.
txt: remove
a
s
pac
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
J
u
ni
o
C
Hamano
Merge branch 'mas
t
er' of
git://git
h
u
b
.
com/git-l1
0
n
.
.
.
commit
|
commitdiff
|
tree
2016-03-23
Juni
o
C
Haman
o
merge
:
refuse to
c
reate too
co
o
l a merge by def
a
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Junio C Ha
m
a
n
o
merge: fix
NULL
p
oi
n
ter dereference when
merg
i
ng nothing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
L
a
r
s Schneider
Documentation: fi
x
git-p4 As
c
iiDoc forma
t
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Jeff Kin
g
git_config_p
u
sh
_
par
a
meter: handle e
m
pty GIT_C
O
NFIG_PARAMETERS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Johannes Schindel
i
n
mingw: skip some tes
t
s i
n
t9115 due
t
o fil
e
name
issu
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Johannes Schindelin
t130
0
:
fix the new --show-orig
i
n
t
es
t
s on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Johanne
s
Schindelin
t1300-r
e
po-c
o
nfig: make i
t
resilien
t
to bein
g
ru
n
via
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
J
oh
a
nn
e
s Schindel
i
n
config --sh
o
w
-
o
r
igin
:
rep
o
rt paths with forward
s
lashes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Stefa
n
Belle
r
submodule: fix regres
s
ion for
deinit without submodul
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-22
Laurent A
r
noud
t
a
g:
add
the option t
o
force signing of annotate
d
t
a
gs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Sven S
t
r
i
ckro
t
h
commit
:
do not lose SQUAS
H
_M
S
G co
n
t
e
nts
Test by
Junio C Hamano
<gitster@pobox.com>.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Ju
n
io C Ham
a
no
Git 2
.
8-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Junio C Haman
o
S
yn
c
with maint
commit
|
commitdiff
|
tree
2016-03-21
J
u
n
io
C Hama
n
o
Merg
e
branch 'mm/doc-hooks-link
g
it-fix' into
m
aint
commit
|
commitdiff
|
tree
2016-03-21
Matthi
e
u M
o
y
D
ocume
n
tation
:
fix brok
e
n linkg
i
t to gi
t
-
c
o
nfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Lars Schneider
Document
a
tion
:
us
e
ASCII quotation marks in git
-
p4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Junio C Hama
n
o
Mer
g
e bran
c
h
'
tb/avoid-gcc-on-d
a
rwin
-
10-6'
commit
|
commitdiff
|
tree
2016-03-21
Eric Sunshine
Revert
"config
.
ma
k
.
u
na
m
e:
use
c
lang for Mac OS
X
1
0
.
6"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Junio C Hamano
M
e
rge branch
'es/st-
a
dd4
-
g
c
c-4
.
2-workaro
u
nd' into maint
commit
|
commitdiff
|
tree
2016-03-21
E
r
ic Sunshi
n
e
git-compat-ut
i
l: st
_
add4:
w
or
k
around gcc 4
.
2
.
x co
m
piler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Junio C Haman
o
Merge tag '
l
10
n
-2
.
8
.
0-rnd3' of
g
it://github
.
c
o
m/gi
t
.
.
.
commit
|
commitdiff
|
tree
2016-03-21
Jun
i
o C Hama
n
o
M
erge bran
c
h 'm
a
ster' of
g
i
t://ozlabs
.
org/~pa
u
lus
/
g
i
t
k
commit
|
commitdiff
|
tree
2016-03-18
Jeff Kin
g
t
/lib-httpd: pass
t
hro
u
g
h GIT
_
CONFIG_NOSYS
T
EM env
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-18
J
e
ff King
credentia
l
-
cache--daemon: clarify "exit" acti
o
n semantics
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-18
Jeff King
send-ema
i
l
: ignor
e
trailing whitespace in mailrc alias
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-18
Stefan Beller
t3404:
c
l
eanup doubl
e
empty lines between tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-18
Stefan Beller
r
ebase: de
c
o
u
ple -
-
exec
from --interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-18
Junio C Ha
m
a
n
o
RelNotes: remo
v
e the mention of !reinclusion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-18
Jun
i
o C Hamano
Rev
e
r
t
"Merge branch '
n
d
/
ex
c
l
usion-regress
i
on-fix'"
commit
|
commitdiff
|
tree
2016-03-18
Junio C Hama
n
o
Revert "Merge
br
a
n
c
h
'
jc/exc
l
us
i
on
-
doc'"
commit
|
commitdiff
|
tree
2016-03-17
Junio C Hamano
Syn
c
wit
h
Git 2
.
7
.
4
commit
|
commitdiff
|
tree
2016-03-17
Junio C
Hamano
Gi
t
2
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-17
Ju
n
io C H
a
mano
Sync
w
ith Git 2
.
6
.
6
commit
|
commitdiff
|
tree
2016-03-17
Junio
C
H
amano
Git 2
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-17
Junio C Ham
a
no
M
e
rge bra
n
c
h 'maint-2
.
5' into maint-2
.
6
commit
|
commitdiff
|
tree
2016-03-17
J
u
nio C Hamano
Git 2
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-17
Junio C Hamano
Merge br
a
nch 'ma
i
n
t-2
.
4' into mai
n
t-2
.
5
commit
|
commitdiff
|
tree
2016-03-17
Junio C Hamano
Git 2
.
4
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-17
J
u
n
io C Ham
a
no
M
e
rge bran
c
h 'jk/path-name-safety-2
.
4' into
m
aint-
2
.
4
commit
|
commitdiff
|
tree
2016-03-16
Junio C Hamano
Git 2
.
8
-
rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-16
Juni
o
C Hamano
Merge branch 'master' of git://bogomips
.
org/git
-
svn
commit
|
commitdiff
|
tree
2016-03-16
Junio C Hamano
S
ync with
m
aint
commit
|
commitdiff
|
tree
next