repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://ozlabs.org/~paulus/gitk
2015-08-26
Junio C
Hamano
Merge
branch
'jc/calloc-pat
h
sp
e
c'
commit
|
commitdiff
|
tree
2015-08-26
Junio C Hamano
Me
r
g
e b
r
anch 'dt/u
n
tracked-spars
e
'
commit
|
commitdiff
|
tree
2015-08-26
J
un
i
o
C
Haman
o
M
e
rge
b
r
anch 'pt/am-bui
l
t
i
n'
commit
|
commitdiff
|
tree
2015-08-26
J
unio C Hamano
Merge br
a
nch 'pt/am-buil
t
in-abort-fix'
commit
|
commitdiff
|
tree
2015-08-26
Junio C Hamano
M
e
rge bran
c
h 'po
/
p
o-
r
eadme'
commit
|
commitdiff
|
tree
2015-08-26
Junio C
H
amano
Merge
branch
'j
v
/send
-
e
m
ail-selective-smtp-auth'
commit
|
commitdiff
|
tree
2015-08-26
Junio C
H
amano
Merge branch 'ep/http-conf
i
gure-s
s
l-
v
ersi
o
n'
commit
|
commitdiff
|
tree
2015-08-26
Ju
n
io C Hamano
Merge branch 's
s
/fix-config-f
d
-leak
'
commit
|
commitdiff
|
tree
2015-08-26
Jiang
Xin
i18n: am
:
fix typo
in description of
-
b option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-26
Christian Couder
t
r
ailer: retitle
a
te
s
t and correct an in-comment mess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-26
B
re
t
t Randall
git-svn doc
:
mention "s
v
n-
r
emote
.
<
n
ame>
.
in
c
lude-p
a
ths"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
J
unio
C Ham
a
no
Sy
n
c with maint
commit
|
commitdiff
|
tree
2015-08-25
J
u
ni
o
C
Hamano
Merge
branch 'jk/guess-
r
epo-name-regress
i
on-fix' into
.
.
.
commit
|
commitdiff
|
tree
2015-08-25
Junio C Ha
m
ano
Merge
branch 'jk/t
e
st-wi
t
h-x' int
o
maint
commit
|
commitdiff
|
tree
2015-08-25
Jun
i
o C Ha
m
ano
Merg
e
branch 'sb/check-return-from-read-ref' into m
a
int
commit
|
commitdiff
|
tree
2015-08-25
Juni
o
C Ha
m
a
n
o
Merge branch 'm
m
/
pull-uploa
d
-pack' into maint
commit
|
commitdiff
|
tree
2015-08-25
Junio C Ham
a
no
pull: pass upl
o
ad_pack
onl
y
w
h
en it
was
giv
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
Fifth batch for 2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
Me
r
ge b
r
anch 'cb/open-noa
t
i
me-
c
le
a
r-er
r
no'
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
Merge branch
'mh/tem
p
file'
commit
|
commitdiff
|
tree
2015-08-25
Junio C Ha
m
ano
Merge branch
'
pt/
a
m-builtin-options'
commit
|
commitdiff
|
tree
2015-08-25
Juni
o
C Hamano
Merge br
a
nch 'dt/refs-pseudo'
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
Merge branch 'dt
/
note
s
-multiple'
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
M
e
rge bra
n
ch 'nd/dwim
-
wildcards-a
s
-paths
p
ecs'
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
Merg
e
branch 'jk/long-error-mes
s
a
g
es
'
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
M
erge
b
ranch 'ee/c
l
ean-remove-dirs'
commit
|
commitdiff
|
tree
2015-08-25
J
u
nio C
Hamano
Merge bran
c
h 'jh/strbuf-read-use
-
read-i
n
-full'
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
b
uiltin/log
.
c: minor reformat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
writ
e
_f
i
le(): drop caller-supplied LF f
r
om calls
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
write_file_v(): do not leave
incomplete line at the end
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
Eric Sun
s
hine
g
e
nerate-c
m
dlist: re
-
im
p
lem
e
n
t as shell
scrip
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
Nguy
ễ
n Thái Ngọc Duy
setup: u
p
date the r
i
ght file
in multipl
e
checko
u
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
SZEDER Gábor
d
es
c
ri
b
e --contai
n
s: de
f
au
l
t to HEAD wh
e
n
no commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-24
J
u
nio C Ham
a
no
w
r
ite_file(): drop "fatal" para
m
ete
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-24
Junio
C
Hamano
bu
i
ltin/am
:
make
sure state files
a
re text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-24
J
unio
C
Hamano
builtin/am:
in
t
rodu
c
e wr
i
te_state_*() helper functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-24
Jeff K
i
ng
rev-list: ma
k
e it obvio
u
s that we do not support notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-24
J
e
ff King
config: silenc
e
warnings for command names wit
h
i
n
v
ali
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-21
SZEDER Gábor
wt-status: m
o
ve #include "
p
at
h
s
p
e
c
.
h
" to the he
a
d
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-21
Christian Couder
tra
i
ler: ignore
first line of
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-21
A
ndreas
S
c
h
wab
Docume
n
t
a
t
ion/config: fix
inconsistent label on
gc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
Ju
n
io C
H
amano
log: show merge commit wh
e
n --cc is give
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
Junio C
H
amano
log: when --cc
i
s
g
iven, default to -p
u
nle
s
s told
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
J
u
nio
C
Hama
n
o
log: ren
a
me "tweak" h
e
lpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
Jeff King
g
e
t_urlmatch
:
avoid usele
s
s str
b
u
f
wri
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
Jeff King
format
_
c
o
nfig
:
simpl
i
fy buffer handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
Jef
f
King
format_c
o
nfig: don't ini
t
strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
SZEDER
G
ábo
r
config
:
restr
u
ctur
e
f
ormat_c
o
nfig(
)
for be
t
ter control
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
SZEDER Gá
b
or
t
3
0
20: f
i
x typo in test de
s
cripti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
J
u
nio
C Haman
o
ps_matched:
xca
l
loc() takes
n
memb and
t
h
e
n element
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
J
u
nio
C Hamano
Sync
with maint
commit
|
commitdiff
|
tree
2015-08-19
J
u
n
io C Haman
o
Fou
r
th batch for
2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge branch 'tb/complete-r
e
base-i-ed
i
t-todo'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Ha
m
ano
Merge
b
r
a
nch
'
jk/git-p
a
t
h'
commit
|
commitdiff
|
tree
2015-08-19
Ju
n
io C Hamano
M
e
rge branch 'jc/finalize-t
e
mp-file'
commit
|
commitdiff
|
tree
2015-08-19
Juni
o
C Haman
o
Merge branch 'ps/guess-repo-name-at-root'
commit
|
commitdiff
|
tree
2015-08-19
Junio C
H
am
a
n
o
Mer
g
e branch 'jk/
g
uess-repo
-
name-regression-fix'
commit
|
commitdiff
|
tree
2015-08-19
Junio
C
Ham
a
n
o
M
e
r
g
e br
a
nch 'jk
/
n
e
gati
v
e-hiderefs'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge branch
'
jk/test-with-x'
commit
|
commitdiff
|
tree
2015-08-19
Ju
n
io C Hamano
Merge bran
c
h
'ps/t1509-chro
o
t-test-fixup
'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge branch '
s
b/check-re
t
urn-from
-
read-ref'
commit
|
commitdiff
|
tree
2015-08-19
Junio
C
H
a
m
a
no
Merge branch 'mm/pull-upl
o
ad-pack'
commit
|
commitdiff
|
tree
2015-08-19
Jun
i
o C H
a
mano
Start pr
e
paring f
o
r 2
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Junio
C
Hamano
Merge branch
'
ta/doc
f
ix-
i
nd
e
x-forma
t
-tech' into maint
commit
|
commitdiff
|
tree
2015-08-19
Jun
i
o
C Hamano
Merge branch 'sb/parse
-
options-
c
odeform
a
t' into maint
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hama
n
o
Mer
g
e branch 'sb/remove-unu
s
ed-var-fr
o
m-builtin-add
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Junio
C
Hamano
Merge branch '
k
n/tag
-
doc-fix
'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2015-08-19
J
u
nio C Hamano
M
erge branc
h
'
e
s/doc-c
l
ean-outdated-
t
ools' into mai
n
t
commit
|
commitdiff
|
tree
2015-08-19
Jun
i
o
C Hamano
Merge branch 'nd/expo
r
t
-worktree
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge b
r
a
nch 'mh
/
f
ast-import-opti
m
ize-current-from
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Junio C Ham
a
no
Merge br
a
nch
'
ib/sc
r
ipted-parse-opt-b
e
tte
r
-h
i
nt-string
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
J
unio
C
H
amano
Merge branch 'se/doc-checko
u
t
-ours-theirs' into m
a
int
commit
|
commitdiff
|
tree
2015-08-19
Juni
o
C Hamano
Mer
g
e
branch '
c
b/un
a
m
e
-in-untrac
k
ed' int
o
maint
commit
|
commitdiff
|
tree
2015-08-19
Junio C
H
a
man
o
Merge bran
c
h
'as/sparse-ch
e
ckout-remo
v
a
l
' into
m
aint
commit
|
commitdiff
|
tree
2015-08-19
J
u
nio
C Hamano
Merge
b
ranch 'db/se
n
d
-
p
ack-us
e
r-
s
igni
n
gkey
'
into
maint
commit
|
commitdiff
|
tree
2015-08-19
Jun
i
o C Hamano
Merge bran
c
h 'jx/do
-
not-crash-receive-pack-wo-head
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Junio C
H
amano
Merge
bra
n
ch 'da/subtree-date
-
conf
u
s
ion' into maint
commit
|
commitdiff
|
tree
2015-08-19
Dave Bo
r
owitz
push:
add a c
o
nfig option push
.
gpgSi
g
n f
o
r d
e
fault
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Dave
B
orowitz
p
u
sh: supp
o
rt signing p
u
s
hes
i
ff the
s
erver
s
upport
s
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Dave Borow
i
t
z
bui
l
ti
n
/send-pack
.
c: us
e
par
s
e_opti
o
ns API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Dave Borowitz
c
o
nf
i
g
.
c: rename git_confi
g
_
maybe_bool_t
e
xt
and export
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Dav
e
Borowitz
trans
p
ort: remov
e
git_
t
ra
n
sport_optio
n
s
.
push_ce
r
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Dave Borowit
z
g
i
t
remote-he
l
pers
.
txt: document pushcert option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
D
a
ve Borowitz
Documentation/git-send-pack
.
txt: d
o
c
u
ment --signed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Dav
e
Borowitz
D
oc
u
mentation
/
git-se
n
d-pack
.
txt: wr
a
p l
o
ng syn
o
psis
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Dave Borowitz
Documentation/g
i
t-push
.
txt
:
documen
t
w
h
en --signed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Heik
o
Voigt
s
u
bmo
d
u
le: allow
e
rro
n
eous
values
f
or the fetchRec
u
rseSu
b
mod
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
He
i
ko Voigt
submodule: use new config A
P
I for
wor
k
tree con
f
igur
a
t
ion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Heiko Voigt
submodul
e
: e
x
tract
f
u
nctio
n
s f
o
r c
o
nfig
s
e
t
and lookup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Hei
k
o Voi
g
t
submodule: imple
m
ent a
c
onfig API for loo
k
up
o
f
.
gitmodules
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
P
aul Tan
am --skip/--abort: me
r
ge
HEAD/ORIG_HEAD tree into index
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Nguyễn T
h
ái Ngọc Duy
untracked cache: fix
e
ntry invalida
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
David Turner
untra
c
ked-cache: fix subdi
r
e
c
tory
handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
N
guyễn
Th
á
i
N
gọ
c
Duy
t70
6
3:
use -
-
force-untrack
e
d-cache to speed up a bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-17
Jacob Keller
notes: teach git-
n
o
tes abo
u
t notes
.
<name>
.
mergeStr
a
tegy
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-17
J
acob Keller
notes: add not
e
s
.
mergeS
t
rategy option to sele
c
t
de
f
a
u
lt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-17
Jac
o
b Keller
notes: a
d
d
t
ests for --commit/-
-
abort/-
-
st
r
ategy exc
l
u
siv
i
ty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-17
Jacob K
e
ller
not
e
s
:
extract p
a
rse
_
note
s
_merge_s
t
r
a
tegy to notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-17
Jacob Keller
notes: extract
enum notes_merge_strate
g
y
t
o notes-ut
i
l
s
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-17
Jacob K
e
l
l
e
r
not
e
s: doc
u
ment cat_sort
_
uniq rewriteMode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next