repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
pull: implement fetch + merge
2015-06-15
Paul Ta
n
pull: implement fetch + merge
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
u
ll: implem
e
nt
skeletal 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
P
aul Tan
argv-array: implement argv_
a
rr
a
y_
p
ushv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
parse-op
t
ions-c
b
: i
m
plement parse_opt_pass
t
hr
u
_a
r
gv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
P
au
l
Tan
parse-options-cb: imple
m
e
n
t p
a
rse
_
o
p
t
_passthru(
)
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 Hamano
S
y
nc with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Git
2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
T
h
e first half
o
f th
e
seventh b
a
tch
f
o
r
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Haman
o
Me
r
ge
b
r
anch 'ld/p4-ed
i
tor-
m
ulti-w
o
rds'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branch 'bc/object-
i
d'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Ham
a
no
M
e
r
ge branch 'jk/at
-
push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Haman
o
M
e
r
ge b
r
anch 'dl/branch-error-message' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch '
j
k/skip-http-test
s
-unde
r
-no-curl' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Me
r
ge branch 'ps
/
d
oc-pa
c
k
f
ile-vs-pack-file' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
M
e
rg
e
branch
'
fg/document-commit
-
mes
s
age-
s
tripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
mano
Merge branch 'jk/re
r
ere-forget-check-enab
l
ed
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Ham
a
no
M
e
rge branch 'pt/pull-log-n'
int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
ama
n
o
Merge bra
n
ch 'pt/p
u
ll-ff-vs-mer
g
e
-ff
'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
M
e
rge branc
h
'rs
/
plug-leak-in-pac
k
-bitmaps'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge
b
r
anch 'ja/tutor
i
al-asciidoctor-fix' into
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
H
a
mano
Merge branch 'jk/stripspace-asciid
o
ctor-fix
'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
M
erg
e
branc
h
'jk
/
asciidoc-markup-f
i
x' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge
b
ranch '
p
s/bundle-verify-ar
g
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ha
m
ano
M
e
rge bra
n
ch 'm
h
/w
r
ite-refs-soone
r
-2
.
4' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'mh/ref
-
directory-fil
e
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
M
e
rge branch 'mg/log-d
e
c
orate
-
HE
A
D' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge b
r
anch
'
sb/t102
0
-clean
u
p' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merg
e
b
ranc
h
'
jc/
g
i
t
ignore-
p
re
c
edence' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e branch 'bc/co
n
nect-plink'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
amano
Merge br
a
n
c
h 'ph/rebase-i-re
d
o
'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merg
e
br
a
n
c
h
'jk/add
-
e
-
ki
l
l-
e
ditor'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge bra
n
ch 'mh/
c
lon
e
-verbo
s
i
ty-fix'
i
n
to
m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'jk/sha1-file-re
d
uce-useless-warni
n
gs
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Ha
m
ano
Merge branch 'tb/blame-resurrect-conv
e
rt
-
to-git'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'jc/plug-fmt-mer
g
e-
m
sg-leak' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branch 'pt/xdg-config-path'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io
C Hamano
Sixth batch f
o
r
2
.
5 cycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
mano
M
e
rge bran
c
h 'sb
/
test-
b
itma
p
-free-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
a
m
ano
Merge bran
c
h 'mm/rebase-i-post-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
Me
r
ge br
a
nc
h
'fm/fetch-r
a
w-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 's
g
/hel
p
-
g
roup'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge branch
'mm/log-format-raw-do
c
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge br
a
nch 'dt/cat-file-
f
ol
l
ow-symli
n
ks
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C
H
amano
M
e
rge branch 'rs/janitor
i
al
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C
H
a
mano
Merge branch
'jk
/
stas
h
-optio
n
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
r
ge b
r
a
n
ch 'da/
m
ergetool-win
m
erge'
commit
|
commitdiff
|
tree
2015-06-01
J
uni
o
C Hamano
Merge branch 'mc/commit-doc-
g
rammofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Merge branch 'jh/f
i
lter-empty-contents'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Haman
o
M
erge branch '
a
h/usage-s
t
rings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge branc
h
'jk/http-b
a
ckend-
d
ea
d
loc
k
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch
'
d
t/clean-
p
athspec-filt
e
r
-
then-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Junio C Haman
o
Merge
b
ran
c
h 'nd/u
n
tracked-cac
h
e'
commit
|
commitdiff
|
tree
2015-05-27
J
e
f
f
King
t70
6
3
:
hide
s
tder
r
from setup inside
pr
e
req
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
m
a
no
Sync wit
h
2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hama
n
o
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge branch 'jk/still-interesting
'
int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio
C
Hama
n
o
Merge br
a
nc
h
'jc/ha
s
h-
o
bj
e
ct'
into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge b
r
anch 'jk
/
rebas
e
-quie
t
-
noop' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
M
e
rge branch
'sg/comp
l
e
t
e-
d
ecorate
-
full-
n
ot-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge b
r
anch '
j
k/fi
l
te
r
-branch-use-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge bran
c
h 'jc/daemon
-
n
o-ipv6-for-2
.
4
.
1' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-05-26
J
unio C
Hama
n
o
M
e
r
ge b
r
a
n
c
h
'jk/stash
-
r
equire-
c
l
e
a
n-
i
ndex' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hamano
M
erg
e
branch 'jk/git
-
n
o-more-argv0-path-munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Fifth batch for 2
.
5
cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C Haman
o
Merge
branch 'nd
/
untracked-cache'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e
b
ra
n
c
h
'rs/plu
g
-leak-in-pack-
b
it
m
a
ps'
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o C H
a
man
o
Merg
e
branch
'pt/pu
l
l-ff-v
s
-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Merge branch 'pt
/
pull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio
C
H
a
man
o
Merge b
r
anch 'jk/
r
erere-for
g
et-check-
e
nabled
'
commit
|
commitdiff
|
tree
2015-05-26
Luke
D
iama
n
d
git-p4: tests:
u
se
t
est-chmtime in place of touc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge
b
ranch
'jk/http-ba
c
kend-deadlock-2
.
3' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge branch 'jk/http
-
backend-deadlock-2
.
2
'
into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff Kin
g
http-backend: spool
r
ef negotiati
o
n requests
t
o buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
struct
r
ef_lock: convert old_sha1 mem
b
er to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
c
hael Haggerty
wa
r
n_if_dangling_symre
f
():
c
on
v
e
r
t local variable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
each_ref_fn_ad
a
pter(): re
m
ove adapter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael H
a
g
gerty
rev_list_i
n
sert_
r
e
f(): remove unne
e
de
d
arg
u
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
a
gge
r
ty
r
e
v_list_i
n
sert
_
ref
_
oid(): new function, t
a
king an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ae
l
Hagge
r
ty
mark_complete
(
): remove
u
nneeded arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
mark_complete_oid(): new
f
unction, takin
g
an
o
bject_o
i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Hagge
r
ty
clear
_
m
a
rks():
re
w
rite
to
take an object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Haggerty
ma
r
k_co
m
pl
e
te(): rewrite to
t
a
ke
a
n objec
t
_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
send_re
f
(): convert loca
l
v
ariable "peeled" to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael H
a
ggert
y
upload-p
a
ck: rewrite func
t
ions to take o
b
ject_id ar
g
uments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
find_symref():
c
onvert local variable "unused" to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
ge
r
t
y
find_sym
r
ef():
rewrite to
t
ake an o
b
ject_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
wri
t
e
_
one_ref():
r
ewrite to take an object_id
argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael H
a
ggerty
write_refs_to_
t
emp_dir()
:
co
n
ve
r
t l
o
cal variable sha1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
s
ubmod
u
l
e: rewrite
t
o take an o
b
ject
_
id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael
H
aggerty
shallow: rewrite functio
n
s to take objec
t
_id argument
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
ge
r
ty
handle_o
n
e
_
ref
(
): rewrite to take an objec
t
_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
add_info_
r
ef(): re
w
rite
to take
a
n object_id a
r
gument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggert
y
h
a
ndle_o
n
e_re
f
lo
g
(): rewrit
e
to take an
object_id a
r
gument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
regis
t
er_r
e
place_ref(
)
: r
e
writ
e
to take an object
_
id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
remote: rewrit
e
func
t
ions
t
o tak
e
ob
j
ect_id arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Hagg
e
rty
a
dd_one_ref()
:
rewrit
e
to take
an obj
e
ct_id arg
u
m
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
stri
n
g
_li
s
t_add_one_ref():
rew
r
ite t
o
take an
o
bje
c
t_i
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
add_ref_decoration(): c
o
n
v
ert local
v
ariable or
i
g
inal_sha1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
add_re
f
_
de
c
oration():
r
e
write to tak
e
a
n
ob
j
ect_id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
show_head_re
f
():
c
o
nvert l
o
cal variable
"unused" t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next