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
pull: support pull.ff config
2015-06-18
Pau
l
Ta
n
pull: support pull
.
ff
c
onfi
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: error on no merge c
a
ndidates
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pu
l
l: pas
s
git-fe
t
ch's options
to git-
f
etch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
pull: pass
g
it-merge's op
t
i
o
ns to git-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pul
l
:
pass verbosit
y
, --pro
g
ress fla
g
s
to fetch and
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
pull: imp
l
ement f
e
tch + m
e
rge
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
pull: implement s
k
e
letal builtin pull
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
a
rgv-array: implement argv_array_pushv(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
p
arse-options-cb
:
imp
l
e
ment parse_opt_passthru_argv()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
pa
r
se-options-c
b
:
impleme
n
t pa
r
s
e
_opt_p
a
ss
t
hru()
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Sync
w
ith 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hama
n
o
The first
half
of
t
he seventh batch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge branch
'
ld/p
4
-editor-multi-w
o
rds'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'bc
/
o
b
ject-id'
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Haman
o
Merge b
r
a
nch 'j
k
/at-push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
a
mano
Merge branch 'dl/branch-e
r
r
o
r-messa
g
e' into
ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e bra
n
c
h
'jk/
s
kip-http-
t
e
s
ts-under-no
-
curl' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Ha
m
ano
Me
r
ge b
r
a
n
ch '
p
s/
d
oc-pac
k
file-vs-pack-file'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch '
f
g/docume
n
t-commit-message-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge
b
ranc
h
'jk/rerere-forget-ch
e
ck-enabled' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
Hamano
M
e
rge br
a
n
c
h
'
p
t/pull-
l
og-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch '
p
t/pull-ff-vs-
m
erge-f
f
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
H
amano
Merge branch '
r
s/pl
u
g-l
e
ak-in
-
pack-bitmaps' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'ja/tu
t
o
rial-asciidoctor-fix' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'jk/stripspace-as
c
i
idoctor-fix' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C
Haman
o
M
e
rge
b
ranch 'jk/ascii
d
oc-markup-fix
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge branch '
p
s/bundl
e
-verify-arg' into
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
M
erge bran
c
h 'mh/write-refs-so
o
ner-
2
.
4'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge br
a
nch 'mh/ref-directory-
f
ile' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e branch
'mg
/
log-decorate-H
E
AD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge
branch
'
sb/t1020-clean
u
p' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge bra
n
ch 'jc
/
gitignore-pre
c
eden
c
e' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
bran
c
h 'bc/connect-plink' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e branch 'ph/rebase-
i
-redo' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
bra
n
ch
'
jk
/
add-e-kil
l
-e
d
i
tor' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
Hamano
Merge branch 'mh
/
clone-verbosit
y
-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branch 'jk/sha1-file-
r
edu
c
e-useless-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hama
n
o
Merge branch 'tb/blame-resurrect-convert-to-gi
t
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C H
a
mano
Mer
g
e bran
c
h 'j
c
/plug-fmt
-
m
e
rge-msg-lea
k
' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ha
m
ano
Merge branch 'pt/x
d
g
-config-path' int
o
maint
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Sixth bat
c
h for 2
.
5 cycl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'sb/test-bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
branch 'mm/r
e
base-i-post-rewrit
e
-
e
x
e
c'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Ha
m
ano
M
e
rge branch 'fm/fetc
h
-
raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
m
a
no
Merge bra
n
ch 'sg/he
l
p-group'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o
C
H
a
m
ano
M
erge b
r
anch 'mm/
l
og
-
format-ra
w
-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C H
a
m
a
no
Me
r
ge branc
h
'dt/cat-
f
i
l
e
-fo
l
low-syml
i
nks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
b
r
an
c
h 'rs/janitoria
l
'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Haman
o
M
erge branch 'jk
/
stash-
o
ptions'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge branch 'da/mergeto
o
l-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch
'
mc/commit-d
o
c-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge br
a
n
c
h
'jh/fi
l
t
er-empty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
a
ma
n
o
Merge branch 'ah/u
s
a
ge-strings'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge branch 'jk/http-backend-deadloc
k
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge branc
h
'
dt/cl
e
an-pathspec-filter-
t
hen-lst
a
t'
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C Ha
m
ano
Merge branch 'nd/untrack
e
d-cach
e
'
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
Ki
n
g
t
7
063: hide
s
tderr fro
m
setup inside prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
uni
o
C Hama
n
o
Sync wit
h
2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
m
a
no
Git 2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Mer
g
e b
r
anch 'jk/
s
till-
i
n
t
e
rest
i
n
g' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
n
o
Merge branch 'jc/hash-object
'
into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
a
no
Merge branch 'j
k
/rebas
e
-quiet-noop' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Merg
e
bra
n
ch 'sg/comple
t
e-deco
r
ate-full-n
o
t-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Ham
a
no
Merge
branch 'jk/filter-b
r
anch-use-of-se
d
-
on
-
incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
an
o
M
e
r
g
e b
r
a
nch '
j
c
/daemo
n
-
no-ipv6-for-2
.
4
.
1
'
into maint
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
i
o
C Hamano
Me
r
ge branch
'
jk/stash-require-clean-index' into
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Haman
o
Merge branch 'jk/git-
n
o-mo
r
e-argv
0
-p
a
th-munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio
C
Hamano
Fifth
b
a
t
ch
f
o
r
2
.
5 cyc
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
Mer
g
e
br
a
nch
'nd/untracked-cache'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Haman
o
M
erge br
a
n
ch
'rs/plug-leak-in-pack-bit
m
aps
'
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Ha
m
a
n
o
Merge br
a
nch 'pt/pull-ff-vs
-
merge-
f
f
'
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hama
n
o
Merge branch
'
pt/pull-log
-
n'
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Merge branch 'jk/rerere
-
forg
e
t-check-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Luke Di
a
ma
n
d
git-
p
4: tests: use t
e
s
t
-
c
hmtime in place of touc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge branch 'jk
/
ht
t
p-backe
n
d-d
e
a
dloc
k
-2
.
3'
i
nto jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Ham
a
no
Merge
b
r
a
n
ch 'jk/http-b
a
c
kend-deadl
o
ck-2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
http-b
a
ckend: spool ref neg
o
tiation requests to b
u
ffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Hagger
t
y
struct ref_lock: co
n
v
e
rt old_
s
h
a
1 member to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
wa
r
n_if_d
a
ngling_
s
ymr
e
f(): co
n
ve
r
t local
v
ariable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
e
l Haggerty
e
a
ch_ref_
f
n_adapter(
)
: remove ad
a
pter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
c
h
ael Haggerty
r
e
v
_list_inse
r
t_ref
(
): remove unneeded argum
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
rev_list_insert_ref_oid(): new funct
i
on, taking an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
mark_complete(): remove unneeded arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
mark_com
p
l
e
te
_
oid(): new function
,
taking an object
_
o
i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Hagge
r
t
y
c
l
ear_mark
s
(): rewrite to take an
o
bjec
t
_
i
d
argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hagge
r
ty
ma
r
k_complete(): rewrite to
ta
k
e an ob
j
e
c
t_i
d
a
r
gument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
send_ref(
)
: conv
e
rt local variable "peeled" to
object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
upl
o
ad-
p
a
ck
:
r
ewr
i
te functio
n
s to
take object_
i
d
argum
e
n
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael
H
aggert
y
find_symref
(
)
:
conve
r
t local
variable "un
u
sed" to objec
t
_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael H
a
ggerty
find_
s
ymref(
)
: rewr
i
t
e
t
o
take an object_id a
r
gumen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
write_one_ref(): rewrite to
take an object_id argume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l H
a
gger
t
y
writ
e
_refs
_
to
_
temp_dir
(
): convert lo
c
al variabl
e
sha
1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
submo
d
u
le: rewrite
to take a
n
object_i
d
a
rg
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
c
h
ael Haggerty
shallow: rewr
i
te functions to
take object_id arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
handle_one
_
ref(): rewr
i
te to take a
n
objec
t
_
i
d argume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
a
dd_info_
r
ef():
r
ewrite
to take an o
b
je
c
t_i
d
argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
h
andle_on
e
_reflog():
rewr
i
te to tak
e
an objec
t
_id a
r
g
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
register_replace_ref():
r
ewr
i
te to take an object_i
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael H
a
ggerty
remote
:
r
e
wr
i
te funct
i
ons to t
a
k
e
o
b
jec
t
_i
d
argu
m
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next