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
Merge branch 'kn/cat-file-literally'
2015-04-29
J
unio C
H
a
ma
n
o
me
r
ge: extract
prepare_merge_message()
l
ogic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merg
e
: narrow
s
c
ope
of merge_nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
m
e
r
g
e: s
p
l
it red
u
ce_par
e
nts()
out
o
f col
l
ect_parent
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: clarify
c
ollec
t
_parents() lo
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Hamano
mer
g
e: s
m
all
l
e
a
kf
i
x
and code simpli
f
ic
a
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
rge: do no
t
c
h
eck argc to determi
n
e number of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
me
r
ge:
c
la
r
i
f
y "pu
l
l
i
ng
i
nto void
"
special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520: test
p
ullin
g
an octopus into an un
b
or
n
branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
t
5
52
0
:
style fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: sim
p
lify code f
l
ow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
t
es
t
the
t
op-level merg
e
driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jef
f
King
filt
e
r-
b
r
anch: avoid passing commit message thro
u
gh sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Phil Hord
rebase -
i
: redo
t
a
s
ks
t
h
a
t
di
e
during cherry-pi
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jeff Ki
n
g
test-lib
:
tu
r
n on GIT_TEST_CHAIN
_
LINT by
d
efault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ramsay
J
ones
t7502-
c
omm
i
t
.
sh: fix a broken and-chain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
bri
a
n m
.
carl
s
on
con
n
ec
t
: im
p
rove chec
k
for plink
t
o
reduce false positives
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
brian
m
.
carl
s
on
t5601: fix qu
o
t
a
t
ion err
o
r leading to skipped tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
brian m
.
carlson
connec
t
: simplify
SSH connection
c
ode pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
i
o
C Hamano
test: val
i
date p
r
ere
q
uist
e
s sy
n
tax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge br
a
nch '
m
h/m
u
ltimail-renew
a
l'
commit
|
commitdiff
|
tree
2015-04-28
J
u
n
i
o
C Ham
a
no
Merge br
a
nch 'mg/show-notes
-
doc'
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io C
H
a
mano
Merge br
a
n
ch 'nd/versio
n
cmp-
p
r
ereleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merg
e
branch
'
mg/status-v-v'
commit
|
commitdiff
|
tree
2015-04-28
L
u
ke
Diamand
g
i
t-p4: add fa
i
ling
tests
f
or case-fold
i
n
g p4d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Luke Dia
m
a
nd
git-p4
:
t9814: prevent --ch
a
in-lint failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jeff King
rebase
:
silence "git checkout" for noop re
b
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Michael Haggerty
Updat
e
gi
t
-mu
l
tim
a
il t
o
version 1
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C
Hamano
Sync with 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C
Hamano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Haman
o
M
er
g
e br
a
nch 'tb/connect-ipv6-parse-fix' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Haman
o
M
erge bra
n
ch
'ma/b
a
s
h
-co
m
pletion-lea
k
ing-x' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hama
n
o
Merge bra
n
ch 'jc/push-c
e
r
t'
into
main
t
commit
|
commitdiff
|
tree
2015-04-27
Fredrik
G
ustafsso
n
Documentation: clarify how "git
c
ommit" c
l
eans
u
p the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-25
T
o
rsten Bög
e
rshausen
t0027:
Add rep
o
M
IX and
L
F_nul
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-24
Michael Haggerty
status: document the -v/--verbose
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Michae
l
Haggerty
RelNotes: wordsmithing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Mi
c
hael Haggerty
RelNotes:
r
e
fe
r
t
o
the rebase -i "
t
odo list",
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Michael Haggert
y
Re
l
Notes
:
correct name of versionso
r
t
.
prerele
a
seSuffix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Micha
e
l Haggerty
git tag:
m
ention vers
i
onsort
.
pr
e
releaseSu
f
fix in manpage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Vitor
A
ntunes
git-p4: improve
c
l
ient path detection w
h
en
branch
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
J
unio C Haman
o
ign
o
re: info/ex
c
lu
d
e should trump core
.
exclud
e
sfile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Juni
o
C Ham
a
n
o
G
it
2
.
4
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
stop putting
a
rgv[0] dirnam
e
at front
of PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
stash: require a
cle
a
n index to apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Je
f
f King
t3903: a
v
oid applying onto dirty index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
t3903:
s
t
op hard
-
co
d
ing commit
s
ha1s
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
etecti
o
n
wit
h
client
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Hama
n
o
Sy
n
c
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
Ju
n
i
o
C Hamano
Merge branch 'jk/colors' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hama
n
o
M
erge branch 'jk/test-ann
o
yances' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Ham
a
no
Merge branch 'pt/enter-repo-comment-fix'
into mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C
H
amano
Merg
e
branc
h
'jz/gitweb-conf-doc-fix'
i
n
t
o
main
t
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Ha
m
an
o
Mer
g
e branch
'j
k
/
c
herry-pick-docfix'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
a
m
a
no
Merge branch 'iu/f
i
x-par
s
e-op
t
ion
s
-
h
-c
o
mment' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Ham
a
n
o
Merge branch
'jg/cguid
e
-w
e
-cannot-cou
n
t' int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C
Ha
m
a
no
Merge
br
a
nch 'jk/pack-co
r
rup
t
ion-post
-
m
o
rtem' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Haman
o
Merg
e
branch 'jn/doc-fast-import-no-16-octopus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Rel
N
o
t
es:
"
merge --quiet" cha
n
g
e has
b
een revert
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C H
a
m
a
n
o
Ho
p
efully the last batch for 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
J
u
n
i
o C Haman
o
Merge branch
'
ps/grep-help
-
all-cal
l
back-arg'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Ham
a
no
Merge branch 'tb/c
o
n
nect-ipv6-parse-fix'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge
branc
h
'v
a
/fix
-
git-p4-te
s
t
s
'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
M
erge branch 'jc/
p
u
sh-
c
ert'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge
b
ra
n
c
h
'ma/bash
-
completion-leaki
n
g
-x'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C
Haman
o
fmt-merge-msg: plug small leak of commi
t
buf
f
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Jeff King
sha1_fi
l
e:
o
nly fres
h
e
n
packs once per run
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Je
f
f
Kin
g
sha
1
_file: fr
e
shen
pack objects be
f
o
re loose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Jeff King
reacha
b
le: only mar
k
loca
l
o
b
jects
a
s recent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Lex
Spoon
git-p4: use -m when running p4 chan
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Matthieu
M
o
y
log -
L
: improve error message on malformed argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Matthieu
M
o
y
Doc
u
mentation
:
chan
g
e -
L
:<r
e
gex>
to
-L:
<
funcname>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Junio C H
a
mano
Merge tag 'g
i
tgui-0
.
20
.
0' of http://repo
.
or
.
cz/r/git-gui
commit
|
commitdiff
|
tree
2015-04-19
Nguyễn Thái Ngọc
Duy
t1
5
09: update pre
p
are script
to be ab
l
e to run
t
150
9
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Nguyễn
Thái Ngọc Duy
index-pack: kill
u
ni
o
n delta_ba
s
e to
s
ave me
m
ory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-18
T
o
rs
t
e
n
B
öger
s
hausen
t0027: suppor
t
NAT
I
V
E_CRLF pla
t
forms
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-18
Tors
t
en
B
ögershaus
e
n
t0027:
c
l
eanup:
r
e
name f
u
nctions; avoid n
o
n-leading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Jeff King
l
imi
t
_l
i
s
t
:
avoid quadratic behavior from still_inter
e
stin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Jeff K
i
ng
type_from_string_
g
en
t
ly: make sure length m
a
t
ches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Ossi
H
erral
a
config: fi
x
sett
i
ngs in default_user_
c
onfig template
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Michael J Gru
b
e
r
rev-list-option
s
.
txt: complete sente
n
ce abou
t
n
otes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Matthieu Mo
y
sta
s
h -p: demonstrate failure of spl
i
t
with mix
e
d
y/n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Matthieu
M
oy
t3904-stash-patch: fa
c
t
o
r PER
L
prere
q
at the top of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Matthieu Moy
t
39
0
4-s
t
ash-patch: f
i
x test d
e
s
cription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Matth
i
eu Moy
add -p: demonstrate f
a
ilure when ru
n
ning 'edit'
a
fter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Ma
t
t
h
ieu Moy
t
3
701-a
d
d
-intera
c
t
i
v
e: simplify code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Elia Pinto
tes
t
-lib-funct
i
ons
.
sh: f
i
x
th
e
sec
o
nd argument to some
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
attr: skip UTF
8
B
O
M at t
h
e beginning of the input
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C H
a
mano
c
o
nfi
g
: use utf8_bom[]
f
rom utf
.
[
c
h]
i
n git
_
p
a
rse_sou
r
c
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C
H
amano
utf8
-
bom: introduc
e
skip_utf8_bom(
)
h
e
l
per
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
add_excludes_from_f
i
l
e: c
l
ar
i
fy the bom skipping logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Carlos Martín Niet
o
dir
:
allow a BOM at the
b
eginnin
g
of exclude files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jeff King
t1430: add an
o
t
her
r
efs-escape t
e
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jeff
King
read_pac
k
ed_refs: avoid
double-checking sane ref
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jef
f
Ki
n
g
strbuf_g
e
tw
h
o
leline: use getdelim
if it is available
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jeff King
strbuf_get
w
hole
l
ine: avoid cal
l
ing strbuf_grow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jef
f
King
s
trbuf_addch: avoid calling
strbuf
_
g
r
ow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jeff King
confi
g
:
use get
c
_unlocked when reading
f
rom fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
J
eff King
strbuf_
g
etwhol
e
l
i
ne: use getc_unlocked
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jeff Kin
g
git-compat-util: add fallbacks
f
o
r
unlo
c
ked stdio
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next