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 --rebase: exit early when the working directory is dirty
2015-06-18
Paul
T
an
p
u
l
l
--
r
ebase
:
exit earl
y
when
the
working directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul
T
an
pul
l
: c
o
nfigure --r
e
b
a
se
v
i
a branch
.
<name>
.
rebase or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll: teach
git
pu
l
l
about --rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: set reflog
m
es
s
age
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull: i
m
plement pulling into an unborn bra
n
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
au
l
Tan
pull: fa
s
t-forward wor
k
ing tree
i
f head is up
d
ated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: chec
k
if
i
n unresolved m
e
rge
s
ta
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
pull:
s
upport
p
u
l
l
.
ff config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: error on n
o
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
p
u
l
l
: pa
s
s git
-
fet
c
h's
options to g
i
t-fet
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul
T
a
n
pull: pa
s
s
g
it-merge's options to g
i
t-m
e
rge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
pull: pass verbosi
t
y, -
-
prog
r
ess flag
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
Paul Tan
pull: impl
e
ment
fe
t
ch +
merg
e
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
P
au
l
T
a
n
pull:
i
mplem
e
nt skele
t
al
b
uiltin
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
a
ul Tan
argv-array: implement argv_array_pushv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
parse
-
opti
o
ns-cb: implem
e
nt par
s
e_opt_pa
s
sthru_argv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Ta
n
parse-opti
o
ns-cb:
i
mpl
e
ment 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
Hamano
Sync wit
h
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
G
i
t 2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C
Ham
a
no
T
he f
i
rst half of the seve
n
t
h batch for
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
H
ama
n
o
Merge branch
'ld/p4
-
edito
r
-
m
ulti-words'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
Ham
a
n
o
Merg
e
br
a
n
c
h 'bc/o
b
ject-id'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Merge branch 'jk/at-push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Mer
g
e branc
h
'dl
/
branch-
e
rror-me
s
sag
e
'
in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch 'jk/skip-htt
p
-tests-un
d
e
r
-no-curl'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C Ha
m
ano
Me
r
g
e bra
n
ch 'ps/do
c
-pa
c
kfil
e
-vs-pack-file'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge branch
'fg/document-co
m
mit-mes
s
age-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge branch '
j
k/rerere-forget-check
-
enabl
e
d' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branch 'pt/pull-log-
n
' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bra
n
ch
'pt/pull-ff-v
s
-m
e
rge-ff'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
mano
Merge
br
a
nch
'
r
s/plug-leak-in
-
pack-bitm
a
ps
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge branch 'ja/tutorial-
a
scii
d
octor-fix' i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Hamano
M
erge
b
ranch
'
jk/
s
tri
p
space-asciidoctor-
f
ix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
amano
Merge branch 'jk/asciidoc-ma
r
ku
p
-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
n
c
h
'ps/bundle-verify-arg' into
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
mano
Merge branch '
m
h/write-re
f
s-sooner-
2
.
4' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch 'mh/r
e
f-di
r
ectory-file
'
in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
m
a
n
o
M
e
r
g
e
branch 'mg/log-decorate-H
E
AD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'sb/t1020-cleanup
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge bran
c
h 'jc/gitignore-prece
d
ence' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anc
h
'bc/con
n
ect-plink' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C
Ha
m
ano
Merge branch 'ph/rebase-i-redo'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch 'jk/add-e-k
i
ll
-
edit
o
r
' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C Hamano
Merge bran
c
h 'mh/clone-verbos
i
t
y-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
e
rge b
r
an
c
h 'jk/sha1
-
f
i
le-re
d
uce-useless-war
n
i
n
gs
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merg
e
b
r
a
nch 'tb/blam
e
-resurrect-
c
onve
r
t-to-gi
t
' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ha
m
an
o
Merge branch 'jc/plug-fmt-m
e
rge-msg-leak
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Ham
a
no
M
erge br
a
nch 'p
t
/xdg-config-path' into m
a
int
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Sixth batch
fo
r
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Haman
o
M
erg
e
branch 'sb/test-b
i
tm
a
p-free-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge bra
n
c
h
'mm
/
rebase-i-p
o
st-rew
r
ite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Merge branch '
f
m
/fet
c
h-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C
H
a
m
ano
Merge branch
'sg/help-g
r
oup'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
m
a
no
M
e
rge br
a
nc
h
'mm/log-format-r
a
w-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
M
e
rge b
r
anch 'dt/cat-
f
ile-fo
l
lo
w
-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Me
r
ge bran
c
h
'
rs/janitorial'
commit
|
commitdiff
|
tree
2015-06-01
J
u
ni
o
C Hamano
Merge br
a
n
ch 'jk/
s
t
ash
-
opt
i
o
ns'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
b
r
anch 'd
a
/mergetool
-
wi
n
merge
'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C H
a
mano
Merge branch 'mc/commit-doc-gram
m
ofi
x
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge br
a
nch
'
j
h
/fil
t
er-empty-c
o
nt
e
n
ts'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
er
g
e branch 'a
h
/
usage-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merg
e
branch 'jk/http-backend-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
an
o
Merge
b
ranch 'd
t
/c
l
ean
-
paths
p
e
c
-filter-th
e
n-lst
a
t'
commit
|
commitdiff
|
tree
2015-05-27
J
u
nio C Hamano
Merge
branch 'nd
/
un
t
r
a
c
k
ed-cach
e
'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7063: hide stderr from
s
e
t
up
inside prere
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
S
yn
c
wi
t
h 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Merge branch
'
jk/s
t
ill-interesti
n
g' in
t
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
Merge branch 'j
c
/
hash-obj
e
c
t' into
maint
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C
H
a
mano
Me
r
ge bran
c
h 'jk/rebase-qu
i
et-noop' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hama
n
o
Merg
e
branch
'
sg/complete-decorate-fu
l
l-not
-
long'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
m
an
o
Merge branch
'jk/filter-branch-u
s
e-of-s
e
d-on-incomplet
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o
C
Hamano
M
e
r
ge
b
ranch 'jc/
d
aemon-n
o
-ipv6-for
-
2
.
4
.
1' into
mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
J
unio C
Hamano
Merge bra
n
ch 'jk/st
a
sh-require-clean-inde
x
' into maint
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Merge br
a
nch 'jk/gi
t
-no-more-a
r
gv0-path-munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Fifth ba
t
ch for
2
.
5
cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hamano
Merge branch 'nd
/
untracked-
c
ache
'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio
C
Hamano
Me
r
ge branch 'rs/plug-l
e
ak
-
in-pack-bitmaps'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
m
ano
Merge branch 'pt/pull
-
ff-
v
s-mer
g
e
-
f
f'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
M
erge
b
ranch 'pt
/
pull-log-
n
'
commit
|
commitdiff
|
tree
2015-05-26
J
unio
C
H
a
mano
Merge branch 'jk/rerer
e
-forget-check-enabl
e
d'
commit
|
commitdiff
|
tree
2015-05-26
Lu
k
e
Dia
m
and
git-p4: test
s
: use test-chmtim
e
in p
l
a
c
e
of to
u
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Merge branch
'
jk/
h
ttp-b
a
c
kend-deadlock
-
2
.
3' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
M
e
r
g
e
branch 'jk
/
http-backen
d
-deadlock-2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
http
-
b
ackend: spool
r
ef negotiation requests
t
o buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
s
truct ref_lock:
c
onver
t
old
_
sha1
m
e
mber to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
wa
r
n_if_dangling_symref(): convert local va
r
i
a
ble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l H
a
g
gerty
each_ref_fn_ad
a
pter(): remove adapter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
r
ev_list_insert_ref()
:
remove unn
e
eded ar
g
u
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
rev_list_in
s
e
r
t
_
ref_
o
id():
new f
u
nction, tak
i
n
g
an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
mark_complete():
remove unneeded arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
erty
mar
k
_
c
o
m
ple
t
e
_
oid
(
): n
e
w
fu
n
c
t
i
o
n, ta
k
i
ng
an object_oid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
erty
clear_marks():
r
ewrite
to take an object_id argu
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
g
ert
y
mark_complete()
:
rewr
i
te to take
a
n object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
erty
send_ref()
:
conver
t
local
v
aria
b
le "peeled"
t
o
o
bj
e
ct_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
upload-pa
c
k: rewr
i
te functions to take object_id a
r
guments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
find_sy
m
ref():
c
on
v
ert
local var
i
a
ble "unused" to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
fi
n
d_symre
f
(): rewrite t
o
t
a
ke an object
_
i
d argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
a
gg
e
rty
writ
e
_one_
r
ef(
)
: rewrite to
t
ake an
o
bje
c
t_id
a
rgu
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
wr
i
t
e_refs
_
to_temp_dir():
c
onvert local
varia
b
l
e
sha
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next