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 --rebase: error on no merge candidate cases
2015-06-18
Paul
Tan
pull --rebase: e
r
ror o
n
n
o
merge candidate
c
a
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull --rebase:
e
xit earl
y
wh
e
n
t
he workin
g
direct
o
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
u
l
Tan
pull:
c
onfigure --rebas
e
v
ia
b
ra
n
c
h
.
<name>
.
rebase
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pul
l
:
te
a
ch git pull about --
r
ebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll:
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 Tan
pull:
implement
p
ul
l
i
n
g into an unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: fast-forward working tree i
f
he
a
d
i
s u
p
dated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll: check if in unresolved merge state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Ta
n
p
u
ll: support p
u
ll
.
ff config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
error on no merg
e
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-fetch's options to
g
i
t-fetc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pul
l
:
p
ass git-merg
e
's options to git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull
:
pass
v
e
rbos
i
ty, --progress flag
s
to
f
etch and
.
.
.
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
u
l Tan
pull
:
implement fetch + 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
Pa
u
l Tan
pull: implement
s
keletal bui
l
tin
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
P
aul
T
a
n
argv-array: implement
argv
_
a
r
ray_pushv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
p
a
r
se-o
p
tions
-
cb: implement parse_opt_pas
s
t
h
r
u_argv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
parse-options-cb:
i
mpleme
n
t 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
Junio C Haman
o
Sync with 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
J
u
nio C Ha
m
ano
The fir
s
t half of the seventh
b
atch for 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'ld/p4-editor-
m
u
l
ti-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'bc/o
b
ject-i
d
'
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Ha
m
ano
Merge branch 'jk/at-
p
ush-s
h
a1'
commit
|
commitdiff
|
tree
2015-06-05
J
unio
C Hamano
Merg
e
branch 'dl/b
r
anch-error-
m
e
s
sage' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
jk/sk
i
p-
h
ttp-t
e
sts-und
e
r
-
no-curl
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C H
a
man
o
Merge branch 'ps/doc
-
p
a
ckf
i
l
e
-
v
s-pa
c
k-file' i
n
to
maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
M
e
r
ge br
a
nch 'fg/docum
e
nt-commi
t
-m
e
ssage-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'jk/rerere
-
forg
e
t-check-enabled
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hama
n
o
Merge branch 'pt/pull-log
-
n' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merge
bran
c
h 'pt/pul
l
-
ff-vs-m
e
rg
e
-ff'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Haman
o
M
erge b
r
anch 'rs/plu
g
-leak-in-pack-bitma
p
s' int
o
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branch 'ja/tutorial-asciidoctor-fi
x
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C H
a
mano
M
erge branch 'jk/strips
p
ace-asciidoctor-fi
x
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Haman
o
Merge branc
h
'jk/asciid
o
c-mar
k
up-fix' into
ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Haman
o
Merge branch 'ps
/
bu
n
dle-verify-arg'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
M
erge branc
h
'
m
h/
w
rite-refs-sooner-2
.
4' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
am
a
no
Merge branch 'mh/ref-di
r
ectory-file'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
M
er
g
e branch 'm
g
/lo
g
-decorate-HE
A
D' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Haman
o
Merge
branch
's
b
/t1020-cleanup' into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C H
a
mano
Merge branch 'j
c
/gitign
o
re-
p
reced
e
n
ce' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
a
mano
Merg
e
branch 'b
c
/connect
-
plink' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
M
erge branch 'ph/reba
s
e-
i
-
r
e
d
o
'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o
C Ha
m
ano
Merge branch 'jk/add-e-kill-editor' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
er
g
e bra
n
ch 'mh/clon
e
-verbosity-fix' i
n
to
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge
branch 'jk/sha1
-
fil
e
-r
e
duce-useless-
w
arnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch 'tb/
b
lame
-
resur
r
ect-
c
onv
e
r
t
-t
o
-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merge branch 'jc/plu
g
-fmt-merge-msg-leak' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
m
a
no
Merge bra
n
ch 'pt/xd
g
-config-path
'
int
o
maint
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
S
i
xth
b
atch fo
r
2
.
5 c
y
c
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
unio
C
H
amano
Merge
b
ra
n
ch
'
sb/
t
est-bitmap-free-
a
t-en
d
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merg
e
branch '
m
m/rebase-
i
-pos
t
-re
w
ri
t
e-exec
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Mer
g
e branch
'fm/fetch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C H
a
ma
n
o
Merge branch 'sg/help-gr
o
up'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge branch 'mm/log-for
m
at-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge br
a
nch
'
dt/cat-fi
l
e
-fo
l
low-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
branc
h
'rs/janitorial'
commit
|
commitdiff
|
tree
2015-06-01
J
un
i
o
C Hamano
Merge bra
n
c
h 'jk/st
a
sh-options
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Merg
e
branch 'da/mer
g
etool-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
erg
e
br
a
n
ch
'
m
c
/commit
-
doc-grammofix
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merg
e
branch 'jh/
f
ilt
e
r-em
p
t
y
-
contents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e branch
'
ah/usage-stri
n
gs'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Merge branc
h
'jk/http-backe
n
d-d
e
a
d
lock'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C
H
amano
Mer
g
e bran
c
h '
d
t
/
clean-pathspec-filter-then-lstat
'
commit
|
commitdiff
|
tree
2015-05-27
Junio
C
Hama
n
o
Merge b
r
a
n
ch 'nd/unt
r
a
c
ked-c
a
che'
commit
|
commitdiff
|
tree
2015-05-27
Jeff
King
t
7
063: hide std
e
rr from set
u
p
inside prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Sync wi
t
h
2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Haman
o
Merge
b
ranch 'jk/still-i
n
te
r
esting' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge branc
h
'jc/hash-object' into maint
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Me
r
ge
b
ranch 'jk/rebase-q
u
iet
-
noop' into
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
rge b
r
anch 'sg/
c
omplete-
d
ecorate-full-
n
ot-lon
g
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
aman
o
Mer
g
e branch 'jk/fi
l
ter-bran
c
h-use-o
f
-s
e
d
-on-incomple
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
ama
n
o
Merge br
a
nch
'jc
/
d
ae
m
on
-
n
o-ipv
6
-
f
or-2
.
4
.
1' into maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merge
branch 'jk/stash
-
re
q
uire-clea
n
-index' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
M
e
rge bra
n
ch 'jk/git
-
no-more-ar
g
v0-
p
ath-munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Fifth bat
c
h for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
erge bra
n
c
h
'nd/u
n
track
e
d-cache'
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Mer
g
e branch 'rs/pl
u
g-lea
k
-in-pa
c
k-bitmap
s
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
r
ge branch 'pt/pull-ff-
v
s-merg
e
-f
f
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e
b
ranch 'pt/pull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Merge b
r
a
n
ch 'jk/rerer
e
-
f
o
rget-c
h
eck-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Luk
e
Di
a
m
a
nd
git-p4: te
s
ts: use tes
t
-chmtime in
place of
touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Ha
m
a
n
o
Merge br
a
n
ch 'jk/h
t
tp-back
e
nd-dea
d
lock-2
.
3' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Merge branch '
j
k/http-backen
d
-de
a
d
l
ock-
2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
htt
p
-backend: spool
ref n
e
gotia
t
ion reques
t
s to
b
u
f
fer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el
H
agger
t
y
struct ref_lock:
c
on
v
ert o
l
d
_
sha1
m
ember to obj
e
ct_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
e
r
ty
warn_if_dangl
i
ng_
s
y
m
re
f
(
)
:
convert l
o
cal variabl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
e
ach_re
f
_f
n
_
a
d
apter(): rem
o
ve adapter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggert
y
rev_list_i
n
sert_ref(): remo
v
e unn
e
e
d
ed a
r
guments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
r
e
v
_list_
i
nsert_ref_oid
(
): new function
,
taking an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
m
ark_complete(): rem
o
ve unneeded
a
rgumen
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
m
a
r
k_complete_oid():
n
ew function, takin
g
a
n
object_oid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
ha
e
l Hagg
e
rty
clear_marks(): re
w
r
i
te to take an ob
j
ect_id a
r
gument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
icha
e
l
Hagg
e
rty
mark
_
complete(): rewrite to take an object
_
id argu
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
erty
send_ref():
conver
t
loc
a
l
variable "peeled" to obje
c
t_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
upload-pack: rewrite funct
i
ons to t
a
ke object_id arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
h
a
el Haggert
y
find_s
y
mref(
)
: convert local
variable "unu
s
ed" to ob
j
ect_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Hag
g
e
rty
find_symref(): rewri
t
e t
o
take an object_
i
d argum
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
write_one_ref(): rewr
i
te
t
o take an objec
t
_id
a
rgumen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next