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: remove redirection to git-pull.sh
2015-06-18
P
a
u
l Tan
p
ull: re
m
ove red
i
recti
o
n to
g
it-pu
l
l
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
pull --rebase:
e
rror on no mer
g
e candid
a
te cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull --rebase:
exit
early when the
w
orking dire
c
tory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull:
con
f
igure
-
-re
b
ase via branch
.
<nam
e
>
.
rebase or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
u
l Tan
pull
:
t
e
ach git pull about --rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: set reflog m
e
ssage
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul T
a
n
pull: implement pulling i
n
to an u
n
born branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Ta
n
pull: fast-f
o
rward
working tr
e
e if
h
e
a
d
is upd
a
ted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull: check
i
f
in unresolved merge state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: suppor
t
pull
.
ff config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: e
r
ror on
no merge candidates
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
pull: pass gi
t
-
f
e
t
ch's options to git-fetch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
u
ll:
pass
g
it-merge's options to
git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul T
a
n
pull: pass verbo
s
ity, --pr
o
g
ress flags to
f
etc
h
and
.
.
.
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
ull: imp
l
em
e
nt fetch + me
r
ge
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
pull
:
implem
e
nt skeletal builtin
p
ull
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
argv-array: implement argv_arra
y
_pushv(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
parse-op
t
i
ons-cb: implement par
s
e_opt_passt
h
ru
_
a
r
gv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
parse-options-cb: implem
e
nt parse_opt_
p
ass
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
Jun
i
o
C Hamano
Syn
c
with 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
Juni
o
C Hamano
T
h
e first half
of the seventh batch for 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch 'ld/p4-editor-
m
u
l
t
i-wo
r
ds'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
er
g
e
bra
n
ch
'
bc/object-id
'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merg
e
branch
'j
k
/at-pus
h
-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
br
a
n
c
h 'dl/
b
ranch
-
er
r
or-mes
s
age' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C H
a
mano
Merge b
r
anc
h
'
jk/skip-http
-
tests-under
-
no-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
n
o
Me
r
ge branch
'
p
s/do
c
-pa
c
kf
i
l
e
-vs-pa
c
k-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C H
a
mano
Merge bra
n
ch
'
fg
/
document-commit-message-stri
p
pin
g
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Me
r
ge branch 'j
k
/rerere-fo
r
g
e
t-
c
heck-
e
nabled' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge bran
c
h
'
pt
/
pull-l
o
g-
n
' into main
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
M
e
rge branch 'pt/pull-ff-vs-
m
erge-ff' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Hamano
M
erg
e
br
a
nch 'rs/plug-l
e
ak-in-pack-bitmaps'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge bran
c
h
'ja/tutorial
-
asciidoctor-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
mano
Merg
e
b
r
anch 'jk/stripsp
a
ce-a
s
cii
d
o
c
tor-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Haman
o
M
erge bran
c
h '
j
k
/asci
i
doc-mark
u
p-fi
x
'
into
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Ham
a
no
M
e
rge branch 'ps/bundle-verify-arg' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'mh/write-refs
-
soo
n
er-2
.
4' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hama
n
o
Merge branch 'mh
/
ref-
d
irectory
-
f
ile'
int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
M
e
rge
branch 'mg/log-decorate-HEAD' into
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge
b
r
anch 'sb/
t
1020-cleanup' into
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Hamano
M
e
rge branch 'jc/gitignore-
p
receden
c
e' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch 'bc
/
connect-plink' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
M
er
g
e branch 'p
h
/r
e
b
ase-i-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio
C
Hamano
Merge branch 'jk/add-e-kill-editor'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
an
o
Merge
branc
h
'mh/c
l
o
n
e-verbosity-fix' into
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch 'jk/sha
1
-file-reduce-
u
seless-
w
arni
n
gs
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
H
a
mano
M
erge
branch '
t
b/bl
a
me-resurr
e
ct-convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merg
e
bran
c
h
'jc/p
l
ug-
f
mt
-
merge
-
msg-l
e
ak' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'pt/xdg-con
f
ig-path' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Haman
o
Si
x
th batch
f
or 2
.
5 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
ge branch '
s
b/test-bitmap-fr
e
e-at-end'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge branch 'mm/rebase-i
-
p
o
s
t-r
e
write
-
e
x
ec'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch 'f
m
/fetch-raw-sh
a
1
'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io C Hamano
Merge branch 'sg
/
h
elp-group'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge branch
'
mm/log-format-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
J
unio
C
H
ama
n
o
Me
r
ge
b
ranch 'dt/cat-file
-
follow-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Me
r
ge bran
c
h
'
r
s
/
j
anitorial'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Merg
e
b
ra
n
ch 'jk/stash-o
p
tions'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
M
e
rge
b
r
anch 'd
a
/
mergetool-wi
n
merge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge br
a
n
ch 'mc/co
m
m
it-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io C
Hamano
Merge branch 'jh/fi
l
ter-empty-
c
ontent
s
'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Me
r
ge bra
n
ch 'a
h
/usage-stri
n
g
s
'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge bran
c
h 'jk/htt
p
-backend
-
deadl
o
ck'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
mano
Merge branch 'dt/
c
lean-path
s
p
e
c
-fi
l
ter-then-l
s
t
a
t'
commit
|
commitdiff
|
tree
2015-05-27
Junio C H
a
man
o
Me
r
ge b
r
anch 'n
d
/untra
c
ked-cac
h
e'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t
7
0
6
3: hid
e
std
e
rr
f
r
o
m s
e
tup inside prere
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
ama
n
o
Git
2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
erge
b
ranch
'
j
k
/still-interes
t
ing' i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
Merge
branch 'jc/hash
-
o
b
ject' i
n
to m
a
int
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merge
b
ra
n
ch 'jk/rebase-qu
i
et-
n
oop' int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Mer
g
e branch '
s
g/compl
e
te-deco
r
a
te-full-n
o
t-lo
n
g'
int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
H
amano
Merge branch 'jk/filter-branch-
u
se-of-sed-on-incomp
l
ete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C
H
amano
Me
r
ge
b
ra
n
ch 'jc/dae
m
on-no-i
p
v6-for-2
.
4
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Merge b
r
a
n
ch 'jk/stash-r
e
quire-cle
a
n-ind
e
x
'
into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Merge b
r
a
n
ch '
j
k/git-no-more-argv0-path-mun
g
ing' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
Fifth batch f
o
r 2
.
5 c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o C
Hamano
M
e
r
ge bra
n
ch 'nd/u
n
tracked-cach
e
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'rs/plu
g
-leak-in-pack-bitm
a
ps'
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C
Hamano
Mer
g
e branch
'pt/pull-ff-vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branc
h
'pt/pull-log-n
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e
branch
'jk/rer
e
re-
f
o
r
get-check-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Luke
D
i
a
mand
git-p4
:
tests: use
t
es
t
-chmtime in place o
f
touc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
branc
h
'
jk/h
t
tp-backend-dead
l
oc
k
-2
.
3' into j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
aman
o
Merge bran
c
h 'jk/
h
tt
p
-
backend
-
deadlock-2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
eff King
h
t
t
p-
b
acke
n
d: spool ref
negotiation requests
t
o buf
f
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
Haggerty
struct ref_lo
c
k: convert old_s
h
a1 member
to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
warn_if_
d
an
g
ling_symref(): convert l
o
ca
l
variable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
each_re
f
_fn_adapter
(
):
remov
e
adapter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
rev_list_ins
e
r
t
_ref(): remove unneeded arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hagge
r
ty
rev_list_in
s
ert_ref_oid()
:
new
func
t
i
o
n, taking an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hagge
r
ty
mark
_
compl
e
t
e(): rem
o
ve unne
e
ded argu
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
mark
_
compl
e
te
_
oid():
n
e
w
f
unc
t
ion,
t
aking a
n
object_o
i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
c
lear_m
a
rks
(
)
:
r
e
write to take an
object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hagge
r
ty
mark_complete(): rewrite
t
o
t
a
k
e a
n
ob
j
ect_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Ha
g
g
e
r
ty
send_ref
(
): conve
r
t
local v
a
riable "peel
e
d"
to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
u
p
loa
d
-pack: rewrite f
u
nctions to tak
e
object_id argum
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Haggerty
f
i
n
d_sym
r
e
f
(): convert local
varia
b
le "unused" to object_
i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael
Haggerty
find_symre
f
(): rewrite to take an object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next