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 Tan
p
u
ll -
-
rebase: exit early
when
t
he wo
r
king
d
irectory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull:
c
onfigure --rebase via branch
.
<name>
.
r
e
b
a
s
e or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull: teach git pull a
b
o
u
t --rebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll: set re
f
log
message
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: impleme
n
t pulling into an unborn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l T
a
n
pull: fast-
f
orward working
tree if head is updated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: ch
e
ck if in unreso
l
ved merge stat
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull: suppo
r
t pul
l
.
ff config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: error on no m
e
rge 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
pu
l
l: pa
s
s git-fetch's optio
n
s to git-fetch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: pass git-merge's options to git-merg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
pull: pass v
e
rbos
i
ty, --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
Paul Tan
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
P
a
ul
T
an
pull: imple
m
ent skeletal
builtin
pu
l
l
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 arg
v
_
array_pushv()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
p
arse-option
s
-cb:
implemen
t
parse_opt_pass
t
h
ru_argv(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
a
n
par
s
e-o
p
tio
n
s
-cb: implement parse_opt_passthru()
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
Haman
o
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
G
i
t 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C
H
amano
The
first half
of
t
he seventh
ba
t
ch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
M
e
rge b
r
anch
'ld/p4-editor
-
m
u
lti-wor
d
s'
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Ham
a
no
Merg
e
branch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge branch 'jk/at-pu
s
h-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'dl/branch-
e
rro
r
-
me
s
s
a
g
e
'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C H
a
mano
Merge branch 'jk/skip-h
t
tp-tests
-
under-no-curl' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branc
h
'ps/d
o
c-
p
ackfile-vs-pack-fi
l
e' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'fg/document
-
commit-m
e
ssage-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
un
i
o C Hamano
Merge branch '
j
k/rerere-forget-check-enabled' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Mer
g
e branc
h
'pt/pull-log-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C H
a
mano
Merge branch
'pt
/
pull-ff-vs-merge-ff' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e branch 'rs/plug-leak-
i
n
-
pack-bitmaps' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
n
o
M
e
rge branch 'ja/tutorial-asciidoctor-fix
'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge
b
ranch 'jk/strip
s
pace
-
asciidoctor-f
i
x
'
into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Haman
o
Merge branch 'jk/asci
i
d
o
c-markup
-
fix' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
Hamano
Merge b
r
a
n
ch 'ps/bundle-ve
r
i
fy-
a
rg'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge branc
h
'mh/write-
r
efs-sooner-2
.
4' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Ham
a
no
Merg
e
branch 'mh/ref-directory-file' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
amano
Merge branch 'mg/
l
og-decorate-
H
EAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
a
mano
Mer
g
e
b
ranch 'sb/t
1
02
0
-c
l
eanup' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'jc/gitigno
r
e-precedence' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merge branc
h
'bc/connect-plink' into
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branch 'ph/rebase-i-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'jk/ad
d
-
e
-
kill-
e
ditor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
aman
o
Merg
e
b
ranch
'mh/clone-verbosity-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge branch 'jk/sha1-file-r
e
duce-usel
e
ss-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Mer
g
e branch 'tb/b
l
a
me-resurrect-convert-to-git'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge br
a
nch 'jc/pl
u
g-fmt-merge-msg-
l
eak' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ranch 'pt/xd
g
-config-p
a
th'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o
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
Ju
n
io C
H
amano
Merg
e
b
r
anch 'sb/test-bitma
p
-free-a
t
-end'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C
H
amano
Merge branch 'mm/rebase-i-post-rewrite-
e
xec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e branch 'fm/f
e
tch-r
a
w-sha1'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io C Hamano
Merg
e
bra
n
ch 'sg/help-
g
r
oup'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
ge br
a
nch 'mm
/
log-format-raw-d
o
c'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merg
e
bran
c
h 'dt/cat
-
file-follow-sy
m
links
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branc
h
'
r
s/janitor
i
a
l'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Ham
a
no
Merge branch
'
jk/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
M
e
rg
e
branch 'da/
m
ergetool
-
winmerge'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge branch 'mc/commit-doc-grammof
i
x
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch
'jh/f
i
lter-empt
y
-
c
ontents'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C
H
amano
Merge
b
ra
n
ch '
a
h/usa
g
e-s
t
rings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Merge bran
c
h
'jk/h
t
t
p
-back
e
nd-deadl
o
ck'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
ge branch 'd
t
/cle
a
n-pathspec-fi
l
ter-t
h
en-lstat'
commit
|
commitdiff
|
tree
2015-05-27
J
u
nio C Hamano
M
e
rge
b
r
a
nch 'nd/untrack
e
d-ca
c
he'
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
King
t7063: hide s
t
derr
from
s
e
t
up inside prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
unio
C
Ha
m
a
n
o
Sync wit
h
2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Git 2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C
Hamano
Merge branch 'jk/
s
t
ill-inter
e
s
t
ing' into
ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge br
a
nch 'jc/
h
ash-object' into
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Haman
o
Mer
g
e branch
'
j
k/rebase-quiet-
n
oop'
i
nto
maint
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C
H
amano
Merge br
a
nch 'sg/comp
l
ete-decorate-full-not-long'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Merge
bra
n
c
h 'jk/filter-branch-use-of-sed
-
on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o C Hamano
M
erg
e
branch 'jc/daemon-no
-
ipv6-for-2
.
4
.
1' in
t
o m
a
in
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk
/
stash-require-clean-index
'
into maint
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Ham
a
no
Merge branch 'jk/git-no-
m
ore-argv0-
p
ath-m
u
nging
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Fi
f
th batch for 2
.
5
cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge
b
ranch
'nd
/
untrack
e
d
-cache'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge branch 'rs/plug-
l
e
ak-i
n
-pack
-
b
itmaps
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
Merge br
a
nc
h
'pt/p
u
ll-f
f
-vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
branch 'pt/p
u
ll-
l
o
g-n'
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
ma
n
o
Merge
branch 'jk/rere
r
e-forge
t
-check
-
enabled'
commit
|
commitdiff
|
tree
2015-05-26
Luke Diama
n
d
git-p4: tests: us
e
test-chmtime in p
l
a
c
e
of t
o
uch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o C Ham
a
no
Me
r
g
e
b
ranch 'jk/http-backend-deadlock-2
.
3'
i
nto j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e br
a
nc
h
'jk/http-b
a
ckend-deadlock-2
.
2' in
t
o jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff
K
in
g
http-backe
n
d: spool ref
negoti
a
tion requests to bu
f
fer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
struct ref_lock: convert old_sha1 member to obj
e
c
t_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
warn_if_da
n
gling_s
y
mref(): conv
e
rt
local
v
ariable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Haggerty
e
a
ch_ref_f
n
_adapter(): remove adap
t
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
r
ty
rev_list_i
n
sert
_
ref(): remo
v
e unnee
d
ed argu
m
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Hagge
r
ty
rev_list_
i
nsert_ref_oi
d
()
:
new function, taking
a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
mark_complete(): remove unneeded arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Hag
g
e
rty
mark_c
o
mplete_oid()
:
new functi
o
n,
taking
a
n
object_o
i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
clear_
m
ark
s
():
r
ewrite to ta
k
e
an object_id argu
m
e
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
mark_compl
e
te(): rewrite to take an object_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
se
n
d_
r
ef(): convert local
varia
b
le "peeled" to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
g
ert
y
uplo
a
d-pack:
r
ewrit
e
func
t
ions to take
ob
j
ect_i
d
arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
find_symref
(
): con
v
ert local
v
ariable "un
u
s
ed" t
o
object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
fi
n
d_symref(): rew
r
ite to t
a
k
e an object_id
argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
e
l
Haggerty
write_one_ref(): r
e
w
rit
e
to t
a
ke
an object_
i
d ar
g
u
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
write_re
f
s_to_t
e
mp
_
dir(): co
n
vert
local va
r
iable sha1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next