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
Merge branch 'dl/subtree-push-no-squash'
2015-05-03
SZE
D
ER
Gábor
completion
:
fix and upd
a
t
e 'git log --decorate=' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
SZ
E
DER Gábor
c
ompletion: r
e
move redundant __
g
it_comput
e
_all_
c
ommand
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
Duy Nguyen
path
s
p
e
c: avoid th
e
n
eed of "--" when
w
ildcard is used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
T
orsten Bögershausen
b
lame:
C
RLF in
the
w
orking tree and LF i
n
the repo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio
C Hamano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hama
n
o
merge:
deprecate
'
git merge <me
s
sage> HEA
D
<commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: handle FETCH_HEA
D
i
n
t
e
rnally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge
:
deci
d
e if we auto-genera
t
e the me
s
s
a
ge earl
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: make collec
t
_parents() auto-gener
a
te the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
ama
n
o
merge: extract prepare_merge_message() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C
Hamano
merge: narrow scope of mer
g
e_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: s
p
lit
reduce_parents() out
of collect_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merg
e
: clarify coll
e
ct_parents(
)
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
m
erge: small
leakfix and code simplif
i
cation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge: do not check
a
rgc to determine
number
of r
e
mote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merge: clarify
"pulling into void" special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
amano
t5520: tes
t
pulling an octopu
s
into an unborn branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
t
5520: s
t
yle fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge
:
si
m
plify
c
ode flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merg
e
: test the top-l
e
vel me
r
ge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jeff King
filter-branch:
a
void
passing c
o
mmit m
e
ssage through
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Phil Hord
rebase -i: r
e
d
o ta
s
k
s
that die
d
u
r
i
ng cherry-pic
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jeff
King
test-lib: turn
o
n G
I
T_TEST_CHAIN_L
I
N
T by
default
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
R
a
m
s
ay Jones
t
7
502-commit
.
s
h
:
fi
x
a
b
roken and-chain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
bri
a
n
m
.
carlson
connect
:
improve check
f
or plink
t
o reduce false posi
t
i
v
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
brian
m
.
car
l
son
t5601: fi
x
q
u
ota
t
ion
error
leading to skipped tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
b
r
ian
m
.
carlson
c
o
nnect: simplify
SSH con
n
ection code path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C
H
a
m
a
n
o
test:
v
a
l
idate prerequis
t
e
s syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C H
a
mano
M
e
rge bran
c
h 'mh/multimail-rene
w
al'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hama
n
o
Mer
g
e b
r
anch
'
mg/show-no
t
es-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
M
e
rge branc
h
'nd/
v
ersioncmp-prereleases'
commit
|
commitdiff
|
tree
2015-04-28
Juni
o
C Hamano
M
e
rge branch
'
m
g/st
a
tus-v-v'
commit
|
commitdiff
|
tree
2015-04-28
Luke
D
iamand
git-
p
4: add
f
aili
n
g tests for
c
as
e
-folding p4d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
L
u
ke D
i
amand
git-p4
:
t9814:
preven
t
--chain-lin
t
f
ailure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jeff King
r
e
b
a
se: silence "g
i
t
chec
k
out" for noop rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
M
i
cha
e
l
Haggert
y
U
p
dat
e
git
-
multimail to versio
n
1
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Sync wit
h
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
J
u
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
M
erg
e
branch 'tb/co
n
nect-ipv6-parse-fix
'
i
nt
o
m
aint
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Haman
o
Merge
b
ran
c
h 'ma/bash-
c
omplet
i
on-leaking-x' into
maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merg
e
bran
c
h 'jc/push-cert' into maint
commit
|
commitdiff
|
tree
2015-04-27
Fredrik Gust
a
fsson
Documentation: cla
r
ify how "gi
t
commit"
c
leans up the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-25
Torst
e
n Bögers
h
ausen
t
0
0
27: Add repoM
I
X
a
nd LF_nul
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-24
Michael
H
aggert
y
s
tatus: docume
n
t
t
he
-
v
/--verbose o
p
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Michael
Ha
g
gerty
RelNotes:
w
ordsmithing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Michael Hag
g
erty
Rel
N
otes: re
f
er
to the rebase
-i "todo list", not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
M
i
chael Hag
g
e
r
t
y
Re
l
Not
e
s: correct name of ve
r
si
o
nsort
.
prere
l
eas
e
S
uffix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Michael Haggerty
git tag: me
n
tion version
s
ort
.
prereleaseSuf
f
ix
in m
a
npage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Vitor Antunes
git-p4
:
i
mprove client pat
h
dete
c
tion
when b
r
anches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Junio
C Hamano
ig
n
o
re: info/exclude should trum
p
c
ore
.
e
xclud
e
sfile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Junio C H
a
mano
Git 2
.
4
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
s
t
op putti
n
g ar
g
v[0] dirname at front of PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
stash:
require a clean index to a
p
ply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
t
3
903
:
avoid a
p
plying on
t
o d
i
r
t
y in
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
J
e
ff King
t
3
903: sto
p
h
a
r
d
-codi
n
g
commit
s
ha1s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Vitor
Antunes
t
9
8
01: check git-p4's br
a
nch d
e
tection
w
it
h
clie
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ha
m
ano
Sync wit
h
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 branch 'jk/colors' in
t
o maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hama
n
o
Merge branch '
j
k/test
-
annoy
a
nces' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Merge b
r
an
c
h
'pt/
e
nter-repo-comment-fix' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch
'jz/gitweb
-
conf-doc-fi
x
' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
e
rge branch 'jk/cherry-pick-docfi
x
' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
H
amano
Merge br
a
nch
'iu/fix
-
parse-optio
n
s-h-comment
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Merge branch 'jg/cguide-we
-
c
annot-
c
ount' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-21
J
u
ni
o
C Ham
a
no
M
e
rge br
a
nch 'jk/p
a
ck-corruption-post-morte
m
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Merge br
a
nch 'j
n
/
d
oc-fast-impo
r
t-no-16-octo
p
us-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio
C H
a
mano
RelNotes
:
"merge --qu
i
et" change has be
e
n reverted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Ham
a
no
Hopefull
y
the
l
ast
b
atch fo
r
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio
C
Hamano
Merg
e
branch 'ps/g
r
ep-h
e
lp-a
l
l-callback-arg'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hama
n
o
Merge branch 'tb/connec
t
-
i
pv6-pa
r
se-fix'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
H
amano
Merge branch 'v
a
/fix-git-p4-
t
ests'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge
br
a
n
c
h
'jc/push
-
cert'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C Hamano
Merge branch '
m
a/bash-completion-leaki
n
g-x'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C
Hamano
fmt-merge-msg:
pl
u
g
sm
a
ll leak of commit buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Jeff King
sha1_file:
onl
y
freshen packs on
c
e per
run
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Jeff Ki
n
g
sha1_file: fr
e
s
h
e
n pac
k
object
s
before loose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Jeff King
reachable: only
mark loc
a
l
objects as recent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Le
x
S
p
oon
git-p4: use -m when running p4 changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Matthieu Mo
y
log -L:
i
mprove err
o
r messag
e
on malformed
a
rgument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Matthieu Moy
D
o
cumen
t
ation: change -L:<rege
x
> to -
L
:<funcna
m
e>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Junio C Hamano
Merge tag
'
gitgui-0
.
20
.
0' of http://rep
o
.
or
.
cz/r
/
git-gui
commit
|
commitdiff
|
tree
2015-04-19
Ngu
y
ễn
Thái
Ngọc Duy
t150
9
:
update p
r
epare
s
c
ript to be able
to run t1509
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Ng
u
yễn Thái Ng
ọ
c Duy
i
ndex-
p
ack:
k
ill uni
o
n delta_base to save
memory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-18
Torsten
Böger
s
hausen
t0027: sup
p
ort
NA
T
IVE_CRLF p
l
atforms
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-18
T
o
rsten Bögersh
a
usen
t00
2
7: cle
a
nup:
r
e
n
ame functions; avo
i
d non
-
leading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
J
e
ff K
i
n
g
limit
_
list: avoid quadratic behavior from st
i
ll_
i
nteresting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Jeff King
type_fro
m
_stri
n
g_
g
en
t
ly: make sure length
m
atche
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
O
s
s
i Herrala
config: fix settings
in default_user_config
t
emplate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Michael
J Gr
u
ber
re
v
-list-optio
n
s
.
txt: complete sente
n
ce about notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
M
a
tthieu
M
oy
stash -p: demonstrate failu
r
e
o
f spl
i
t wi
t
h mixed y/n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Matthieu
Moy
t
3
904-stash-patch
:
factor PERL prer
e
q a
t
t
h
e
top of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Ma
t
thi
e
u Moy
t3904-stash-pat
c
h: fix
t
e
s
t d
e
scription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Mat
t
hieu Moy
add
-p:
d
emons
t
rate failure whe
n
runn
i
ng 'edit' after
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Matthieu M
o
y
t3701-ad
d
-
i
nt
e
ra
c
ti
v
e
:
simplify cod
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
E
lia Pin
t
o
tes
t
-li
b
-functions
.
sh:
f
ix the s
e
co
n
d argument to some
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
J
u
n
i
o C Hamano
at
t
r:
s
kip UT
F
8
B
O
M a
t
t
he beginning of
t
he input file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
c
onfig:
u
s
e
utf8_bom
[
]
fr
o
m
utf
.
[ch]
i
n git_pars
e
_source
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Ham
a
no
utf8-bom
:
introduce skip_utf8_bo
m
() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jun
i
o C Haman
o
a
dd_excludes_fr
o
m_fil
e
: clari
f
y the bom skipping logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next