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: teach git pull about --rebase
2015-06-18
P
a
ul T
a
n
pull: t
e
ach
git pull about -
-
r
ebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: set
reflog message
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Ta
n
pul
l
: implemen
t
pulling i
n
to an unbor
n
b
r
an
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul
Tan
pu
l
l:
fast-forwa
r
d working
t
r
ee if head is up
d
ated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull:
che
c
k if in unresolved
m
e
r
ge sta
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
l
l
:
suppo
r
t
pull
.
ff
con
f
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull: erro
r
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 git-fet
c
h's options to
g
it-
f
etch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
pull: pass git-m
e
rge'
s
options to
git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
T
a
n
pull
:
pass
v
e
r
bosity, --progress flags 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
:
imple
m
ent fe
t
ch +
m
erge
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
T
a
n
pull
:
imp
l
ement ske
l
eta
l
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
Pa
u
l Tan
argv-array: implement a
r
gv_array_pushv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
pa
r
se-options-
c
b: imple
m
ent pa
r
se_op
t
_passthru
_
ar
g
v()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
parse-options-cb
:
i
m
p
l
ement parse_opt_pas
s
thru()
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 Ham
a
no
Sy
n
c
with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
G
i
t
2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
T
h
e first hal
f
o
f the seventh ba
t
c
h f
o
r 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
Hamano
Mer
g
e branch 'ld/p4-ed
i
to
r
-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge
b
r
anch
'
bc/object-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch '
j
k/at-p
u
sh-sha
1
'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'dl/branch-error
-
m
e
ssa
g
e' into m
a
in
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch 'j
k
/skip-http-tests-un
d
er-no
-
curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C
H
a
m
ano
Merge branch 'p
s
/doc-packfile-vs-pack-file
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branch
'f
g
/document-commi
t
-message-strippin
g
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'jk/rerere-forget-c
h
eck-enabled'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ha
m
a
n
o
Mer
g
e branch '
p
t/pull-log-n' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'pt/p
u
ll-ff-vs-
m
erge-ff' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge br
a
nch 'rs/plug-leak-i
n
-pack
-
bitmaps' i
n
to m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
M
erge branch
'
ja/tutoria
l
-
a
s
ciid
o
ctor-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Mer
g
e
branch 'jk/stripspace-asciidoctor-fix'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'jk/asciidoc-marku
p
-f
i
x' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge
b
r
anch 'ps/bundl
e
-verify-arg' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
g
e
bran
c
h
'
mh/wr
i
t
e
-refs-sooner-2
.
4' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'mh/ref-directory
-
file' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ham
a
no
Merge branch
'mg/lo
g
-decora
t
e-HEAD' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C Hamano
Merge branch
'
sb/
t
1020-cleanup' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge
b
ran
c
h 'jc/giti
g
nore-precedence' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Mer
g
e branch 'bc/co
n
nect-plink' in
t
o main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ha
m
ano
M
e
r
g
e bra
n
c
h
'
ph/rebase-i-redo' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
branch 'j
k
/add-e
-
kill-
e
d
i
to
r
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Merge branch 'm
h
/clone-v
e
rbosity-fi
x
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'jk/sha1-
f
ile-reduce-usele
s
s-w
a
rnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch
'
tb/blam
e
-
r
esurrect-convert-to-g
i
t'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch '
j
c/plug-fm
t
-merg
e
-msg-leak' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ranch 'pt/xdg-
c
o
n
fig-p
a
th' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Sixth batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
n
o
Me
r
ge branch '
s
b/test-
b
i
t
m
ap-free-a
t
-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
a
n
o
Merg
e
branch 'm
m
/
rebase-i-post-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Haman
o
Merge bra
n
ch 'fm/fetch-raw
-
sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
a
m
ano
M
e
rge bra
n
ch 'sg/help-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
n
o
Merge branch 'mm/log-for
m
a
t
-r
a
w-doc'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io
C
Hamano
Merge branch 'dt/cat-file-follow-symli
n
k
s
'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge b
r
a
n
ch
'rs/jan
i
to
r
i
al'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge branch
'
jk/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge branch 'da
/
mergetool-
w
inmerge
'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C
H
amano
Merg
e
b
r
anc
h
'
m
c/commit-doc-
g
r
a
m
m
ofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Merge bran
c
h 'j
h
/f
i
l
ter-emp
t
y-contents'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o
C
Hamano
M
erge
bran
c
h '
a
h/usage-s
t
r
ings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
ama
n
o
Merge branch 'jk/http-ba
c
kend-d
e
adl
o
ck
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
mano
Merge branch 'dt/clean
-
pa
t
hspec-filter-t
h
en-ls
t
at'
commit
|
commitdiff
|
tree
2015-05-27
Ju
n
io C H
a
ma
n
o
M
e
rge
b
ranc
h
'n
d
/untracked
-
cache'
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff King
t7063: hide stderr
from
setup
i
nside p
r
e
req
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 Hama
n
o
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Ha
m
a
n
o
Merge branch 'jk/st
i
ll-int
e
resting'
into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
a
n
o
Mer
g
e bra
n
ch 'jc/hash-object' into
m
ain
t
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Me
r
ge
bran
c
h
'jk/rebase-quiet-noo
p
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Haman
o
Merge bran
c
h 'sg/c
o
mplete-decorate-full-not-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge
branch 'jk/filte
r
-branch-use-of-sed-on-incompl
e
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
M
e
rge bran
c
h '
j
c/daemon-no-ipv6-for
-
2
.
4
.
1
'
into
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
man
o
M
e
rge bra
n
ch
'
jk/stash-req
u
ire-cle
a
n-
i
n
d
ex' into maint
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C
H
a
mano
Merge
branch 'jk/git-no
-
more-
a
rgv0-path-munging' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
F
ifth ba
t
ch for 2
.
5 cycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
a
n
o
Merg
e
branch 'nd/untracke
d
-cache'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C H
a
mano
Me
r
g
e branch 'r
s
/plug
-
le
a
k-in-pack-bitma
p
s
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'pt/pull-
f
f-
v
s-m
e
rge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
Me
r
ge
branch 'pt/pull-l
o
g
-
n
'
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge
b
ranc
h
'jk/rerere-fo
r
get-check-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Luke
D
i
ama
n
d
git-p4: tests:
u
se tes
t
-ch
m
time in place of
t
ouch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
M
er
g
e branch '
j
k/http
-
backend-d
e
a
dlo
c
k-2
.
3' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Merge branch 'jk/ht
t
p-
b
a
c
kend-dead
l
o
c
k-
2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
eff Kin
g
http-backend: spool ref negotiation reque
s
ts t
o
buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
g
e
rty
struct ref_
l
ock:
c
o
n
v
e
rt old_sha1 member to ob
j
ect_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
warn_if_dangling_symref(): co
n
v
ert local
v
ariable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
each_ref
_
fn_ada
p
ter(): remov
e
adapt
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
rev_li
s
t_insert_ref(): remov
e
unneeded a
r
gu
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Hagger
t
y
rev_lis
t
_insert
_
ref_oid(
)
: new f
u
nction, taking an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
mark_
c
omplete(): re
m
ov
e
unneeded
a
rguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
mark_c
o
mplete_oid
(
):
new
f
u
nctio
n
, taking an objec
t
_oid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
clear_
m
a
rks():
r
ewrite to
t
ake
a
n object_
i
d
a
rgument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
mark_complet
e
(): rewrite
to ta
k
e an object_id arg
u
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
se
n
d_ref(): convert local
v
ariable "peeled
"
to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
c
h
a
e
l
Hagg
e
rty
up
l
o
ad-pa
c
k: rewri
t
e func
t
ions to take object_
i
d argu
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
c
h
a
e
l Haggerty
find_s
y
m
r
e
f(): conver
t
local
variable "un
u
sed"
t
o o
b
ject_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
find
_
symref(): 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 Hagger
t
y
w
r
i
te_one
_
r
e
f(): rewrite to
t
ake an object_
i
d
a
r
g
u
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
e
l
Haggerty
write
_
refs_to_
t
emp_dir
(
)
: convert local variable sha1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
submodule: rewrite to take an object
_
i
d argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Haggerty
sha
l
low: rewrite functions to
t
ake obje
c
t
_
id a
r
guments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next