repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with master
2015-05-04
Jonathan Nieder
c
o
nfig: us
e
e
rror()
i
nstead of
f
p
rintf
(
stderr,
.
.
.
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-04
Eric S
u
nshine
git-ha
s
h-ob
j
e
c
t
.
txt: doc
u
men
t
--literally
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
SZ
E
DER Gábor
completion: fix and upd
a
te 'git log
-
-
decorate=' optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
SZEDER Gábo
r
completi
o
n: r
e
move redundant __
g
it
_
compute_all_
c
ommand
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
Duy Nguyen
pathspec
:
av
o
id the
n
e
ed of
"--" when
w
i
ldcard is used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
To
r
sten
Bögershausen
b
l
ame: CRLF in the working tree
a
nd LF in the repo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
J
u
nio C Hamano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C
Haman
o
merge: d
e
precate 'gi
t
merge <message> HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge: handle FETCH_HEAD inter
n
ally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: d
e
cide i
f
we auto-generate the message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
m
a
k
e col
l
ect
_
paren
t
s(
)
a
u
to-ge
n
erate the
m
er
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Haman
o
m
erg
e
: extrac
t
prepare
_
merge_
m
essage() log
i
c
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C
Hamano
merge: narrow
s
cope of merge_n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
mano
merge: split reduce_parents() out o
f
colle
c
t_
p
arents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge
:
cl
a
r
if
y
co
l
lect_pare
n
ts
(
) logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small leakfix
a
nd co
d
e simp
l
i
f
ic
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
un
i
o C Ham
a
no
merge: do not check argc to det
e
r
m
in
e
number of
remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarif
y
"pull
i
ng
into
v
o
i
d
"
special
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520
:
te
s
t
pulling
an octopus into an unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
t55
2
0:
sty
l
e fi
x
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hama
n
o
merge: si
m
p
l
ify code flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Haman
o
m
erge
:
test th
e
top-le
v
el merge
d
river
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jef
f
King
filter-b
r
an
c
h
:
avoid pas
s
i
n
g com
m
it
message through s
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Phil
Hord
rebase
-
i: redo t
a
sks that die during cherry-p
i
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jeff Kin
g
test-
l
ib:
t
urn on
GIT
_
TEST_CHA
I
N_LINT by defau
l
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ramsa
y
Jones
t7502-com
m
it
.
sh
:
fix a broken and-c
h
ain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
brian m
.
carlson
connect: improve che
c
k for
p
li
n
k
to re
d
u
c
e
false posi
t
ives
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
brian m
.
carlson
t
5
601: fix quot
a
t
ion e
r
ror leadi
n
g to skip
p
ed tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
brian m
.
carlson
connect:
simplify
S
SH co
n
nection cod
e
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
tes
t
: validate prerequ
i
stes syn
t
ax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
unio C Hama
n
o
Me
r
ge branch 'mh/multimail-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Hama
n
o
Merge branc
h
'mg/s
h
o
w-notes-
d
oc'
commit
|
commitdiff
|
tree
2015-04-28
Juni
o
C Hamano
Merge branch
'nd
/
ver
s
i
oncmp-prereleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Mer
g
e branch 'mg/status-v-v'
commit
|
commitdiff
|
tree
2015-04-28
Luk
e
Diamand
git-p4: add failing
t
ests
for ca
s
e-folding p4d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Luke Diamand
g
it-p4: t9814: prevent --chain-lint
f
ailure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jeff King
reb
a
se: silence "git
c
h
eckout" for
noop rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Michael Hagger
t
y
Update git-multima
i
l to
v
ersion 1
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C Hamano
Sync
w
ith 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Juni
o
C Hamano
G
i
t 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge branch
'
tb/
c
onn
e
ct-ipv6-pars
e
-fix'
into main
t
commit
|
commitdiff
|
tree
2015-04-27
J
u
n
io C
H
am
a
no
Merge branch '
m
a/bash-co
m
ple
t
ion-l
e
aking-x' into maint
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C Haman
o
Merg
e
b
ranch 'jc/pus
h
-cert' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-04-27
F
r
edrik Gustafsson
Documentati
o
n:
clari
f
y h
o
w
"
g
i
t commit" cleans
up the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-25
Torsten Bögersha
u
sen
t
0
0
27: Add repoMIX
and
LF_n
u
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-24
Michael Hagge
r
ty
status: document the -v/--verbose opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Michael Haggerty
RelNotes
:
words
m
i
t
h
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Micha
e
l
H
ag
g
er
t
y
R
elN
o
te
s
: refe
r
t
o
the
r
ebase -i "todo list"
,
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Mich
a
e
l
Hagge
r
ty
RelNotes: correct name of ve
r
s
i
o
nso
r
t
.
prerele
a
s
e
S
u
f
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Michae
l
Haggerty
git
ta
g
: mention versionsor
t
.
p
rereleaseSuffix
i
n m
a
npage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
V
i
t
or Antunes
gi
t
-p4: impro
v
e
c
l
ient path de
t
ec
t
ion when bra
n
ches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
J
u
nio
C
Hamano
ignore: i
n
fo/exclude
s
hould trump co
r
e
.
e
xcludesfi
l
e
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-22
Jeff King
stop
p
utting argv
[
0]
dir
n
a
m
e at front of
PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Je
f
f King
stash: re
q
ui
r
e a
clean
index to apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
t3903: avoid apply
i
ng
onto
dirty index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
t3903: stop hard-coding commit
sha1s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
V
itor Antunes
t9801: check git-p4's branch
d
etect
i
on with clien
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hama
n
o
S
y
nc wi
t
h
m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Git 2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hama
n
o
Merge branch 'jk/colo
r
s' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge b
r
a
n
ch 'jk/test-annoya
n
ces
'
int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ham
a
no
Merge branch 'pt
/
ente
r
-rep
o
-
c
omment-fix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Hamano
Merge branch 'jz/gitweb-co
n
f-doc-f
i
x' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge bra
n
c
h 'jk/cherry
-
pi
c
k-docfix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch 'iu/fix-parse-options-h-com
m
ent
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio
C
Hamano
Merg
e
branch 'jg/cguid
e
-we
-
cannot-count' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
a
mano
Merge
b
ranch 'jk/p
a
ck-co
r
rupti
o
n-post-
m
o
r
t
em'
int
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
ama
n
o
Merge
b
ranch 'jn/doc-fast-import-no-16-octopus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
RelNotes: "
m
er
g
e
-
-
qui
e
t" change has been reverted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
H
ope
f
ully the la
s
t batch for 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge
b
ranch
'ps/g
r
ep-he
l
p-all-callback
-
arg
'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C Hamano
Merge b
r
anch
'
tb/
c
onnec
t
-
ipv6-par
s
e-fix'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Ha
m
ano
M
e
rge branch 'va/fix-gi
t
-
p
4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Haman
o
Merge branch
'jc/pu
s
h-cert'
commit
|
commitdiff
|
tree
2015-04-20
Junio C H
a
man
o
Merge br
a
n
ch
'ma/
b
ash-c
o
mpletion-leaking-x'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
Ha
m
a
no
fm
t
-m
e
rge-msg:
p
lug s
m
all leak of
commit
b
uffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
J
e
f
f King
s
h
a
1_file: onl
y
f
re
s
h
e
n
p
acks once per run
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
J
eff King
sha1_file: fres
h
en pack objects
b
efor
e
lo
o
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Jeff King
reachable: only m
a
rk
local objects as
recent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Lex Spoon
git-p4: use -m when run
n
ing p4 changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Matth
i
eu
Moy
l
o
g -L
:
improve error messa
g
e on ma
l
forme
d
a
r
gument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
M
a
t
th
i
eu Moy
Documentation
:
ch
a
nge -
L
:<regex>
to -L:<funcname>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Junio C Ham
a
n
o
Me
r
ge tag 'g
i
tgui-0
.
2
0
.
0
'
of
h
ttp:
/
/repo
.
or
.
cz/r/git-gui
commit
|
commitdiff
|
tree
2015-04-19
Nguyễn
Thái Ngọc Duy
t
1
5
0
9: update prepare script to be ab
l
e to r
u
n t1509
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
N
guyễn Thái Ngọc Du
y
i
ndex-pack: kill union delta_base
t
o save memory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-18
Torsten Böge
r
shausen
t002
7
:
support NAT
I
VE_CRLF
platforms
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-18
Torsten
Böger
s
hause
n
t0027: cleanup: rename fun
c
tions;
a
void non-le
a
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Jeff
King
limit
_
list: avoid quadrat
i
c behavior from still_intere
s
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Je
f
f K
i
ng
type_f
r
om_string_gently: ma
k
e sure length matches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Ossi
Herrala
config: fix se
t
t
i
n
g
s
i
n default_user_
c
onfig templat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Mi
c
hael J G
r
uber
rev
-
l
ist-options
.
t
x
t:
c
omple
t
e
s
ente
n
ce about notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Matthieu
M
o
y
stash -p:
demon
s
tra
t
e failure of spli
t
with mi
x
e
d
y
/n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Ma
t
th
i
eu Moy
t3
9
04-stash-patch: factor
PER
L
prereq a
t
the
t
o
p
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
M
a
tthieu
Mo
y
t
3904-sta
s
h
-
pat
c
h: f
i
x te
s
t description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Ma
t
t
hieu Moy
add -p: d
e
monstrate failure when runnin
g
'edit' after
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Matthi
e
u Moy
t370
1
-add-interactive: s
i
m
p
lify code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Elia Pinto
test-lib-fun
c
tions
.
sh: fix the second argument
t
o som
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Ju
n
io C
Haman
o
at
t
r: skip
UTF8
B
OM at the
beginn
i
ng of
t
he input file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Juni
o
C
Hama
n
o
config: use utf8_b
o
m[] from utf
.
[ch] i
n
g
it_p
a
rse_source()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next