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: support pull.ff config
2015-06-18
Paul Tan
p
u
ll: sup
p
ort pull
.
ff con
f
ig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull: error o
n
n
o m
e
rge candida
t
es
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull: pass git-fetch's opti
o
ns
to g
i
t-fetch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: pass git-merge's option
s
to g
i
t-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: pass verbosity, --progress flags
t
o fetch a
n
d
.
.
.
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
pul
l
: im
p
l
e
ment fetc
h
+
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
Tan
p
ull: implem
e
n
t
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 Ta
n
a
rgv-array: implement argv_ar
r
ay_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
n
t
par
s
e_opt_p
a
s
s
thru_argv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
T
an
par
s
e-opti
o
ns-c
b
:
impl
e
ment
parse_opt_
p
assthru()
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
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Git
2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Haman
o
T
h
e
first half of
the sev
e
nth batch for 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branc
h
'
l
d
/p4-
e
dito
r
-
multi-w
o
rds'
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hama
n
o
Merge branch 'bc
/
object-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch
'jk
/
at-
p
u
s
h-
s
ha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
m
an
o
Merge branch '
d
l/b
r
anch-e
r
ror-message' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
Hamano
M
e
rge branch
'
j
k
/
skip-ht
t
p
-tests-u
n
der-no
-
curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branch
'ps/d
o
c
-pa
c
kfil
e
-v
s
-
pack-file' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
unio
C Hama
n
o
Merge branch 'fg/docu
m
ent-com
m
i
t-mes
s
a
g
e-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hama
n
o
Merge
branch
'jk
/
rerere-forget-chec
k
-enable
d
' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
M
erge br
a
n
ch 'pt/pull-log-n' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C H
a
m
an
o
Merge bra
n
ch 'pt
/
pul
l
-
f
f
-vs-mer
g
e-ff' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
bra
n
c
h
'rs/pl
u
g
-leak-in
-
pa
c
k-bitmap
s
' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
a
no
M
erge branch 'j
a
/tutorial-asciidoct
o
r-fix' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
M
erge
br
a
n
c
h 'jk/st
r
i
ps
p
ace-asci
i
doctor-f
i
x' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Me
r
ge branch 'jk/asciidoc-markup-fix' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge branch 'ps
/
bund
l
e-verify-arg' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hama
n
o
Merg
e
branch 'm
h
/write
-
r
efs-sooner-2
.
4' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
M
erge branch 'mh/ref-directory-f
i
le' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch 'mg/log-
d
ecora
t
e
-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge
b
ranc
h
'sb/t
1
020-
c
leanup'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C
Haman
o
Mer
g
e branc
h
'jc/g
i
ti
g
nore
-
pre
c
ed
e
nc
e
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'b
c
/connect-plink' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hama
n
o
Merge branch
'
ph/rebase
-
i-redo' int
o
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C Hama
n
o
Merge
branch 'jk/add
-
e-kill-editor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'mh/clone-verbosity-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge br
a
nch 'jk/sha1-file-r
e
d
u
ce-useless-war
n
i
ngs
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'tb/blame-resur
r
ect-convert
-
t
o
-git' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'jc/plug
-
fmt-merge-msg-leak
'
into
maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Me
r
ge branch 'pt/xdg-config-path' into maint
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
S
i
xth batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Ham
a
no
M
e
rge branch 'sb/tes
t
-bit
m
a
p-
f
ree-at
-
end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
M
e
r
ge bra
n
ch 'mm/r
e
b
ase
-
i
-
post-re
w
rite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Merge branch
'
fm/fetch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Mer
g
e branch 'sg/help-gro
u
p'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Ham
a
no
Merge
b
ranch 'mm/log-format-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
ama
n
o
Merge
b
r
anch 'dt/cat-file-follow-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C
Haman
o
Merge branc
h
'rs/janitorial'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Haman
o
Merge branch 'jk/st
a
sh-options'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o
C Hamano
Merg
e
bra
n
ch 'da/merge
t
ool-winmerge
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hama
n
o
Merg
e
branch
'
mc/com
m
it-doc-g
r
a
m
mofix
'
commit
|
commitdiff
|
tree
2015-06-01
J
un
i
o C H
a
mano
Merge b
r
anch
'
j
h/f
i
lter-empty
-
conte
n
ts
'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C
Hamano
M
e
rge
branch 'ah/usage
-
s
t
rings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Mer
g
e b
r
a
nch 'jk/http-backend-dea
d
lock'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
Merge branch 'dt/cle
a
n-pa
t
hspec-f
i
l
t
er-then-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Junio
C
H
a
mano
M
erge branch 'nd/untracked-
c
ac
h
e
'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7063: hide s
t
derr
f
rom setup insid
e
p
r
ereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hama
n
o
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C H
a
mano
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C
Hamano
Merge
b
ranch 'jk
/
still-
i
nterest
i
ng' int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C
Hamano
Merge
b
ran
c
h 'jc/h
a
sh-o
b
ject' into m
a
int
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
am
a
no
Merge bran
c
h
'
jk/re
b
ase-qu
i
et-noop'
i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
m
ano
M
e
rge b
r
anch 'sg/complete
-
decorate-full-
n
ot-long' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Ham
a
no
Merg
e
b
ran
c
h 'jk/filter-branch-use-of-sed-on-incompl
e
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jc/daemon-no-
i
p
v
6-
f
o
r
-2
.
4
.
1
'
into maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C H
a
man
o
Merge branc
h
'
jk/stash-
r
equi
r
e-clean-i
n
d
e
x' int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
M
e
rge branch 'jk/git-no-more-argv0-path-munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Fifth batch for 2
.
5 cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Merge branch
'
nd/untracked-ca
c
he
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'rs/p
l
ug
-
leak-in
-
p
ack-bitmaps'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e
branch 'pt/pull-ff-v
s
-merg
e
-ff'
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
Merge branch 'pt/pull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge br
a
nch 'j
k
/rer
e
re-forget-check-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Lu
k
e Diamand
git-p4: tests: use
test-chmt
i
me in place
of touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
branch '
j
k
/
http-
b
ac
k
end-de
a
dlock-2
.
3' int
o
jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Haman
o
M
erge
b
r
anch 'jk/h
t
tp-backen
d
-dea
d
loc
k
-2
.
2' i
n
to
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
eff K
i
n
g
http-backen
d
:
spool ref negoti
a
tion requests t
o
buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
e
l
Haggerty
struct ref_lock:
con
v
ert old_sha1 member to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
er
t
y
w
a
rn_if
_
dangling_symre
f
()
:
convert lo
c
al var
i
ab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
agger
t
y
each_
r
ef_fn_adap
t
er(): r
e
move
adapter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l H
a
g
gerty
rev_l
i
st_insert_ref()
:
re
m
ove
unneeded arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
rev_list_insert_
r
ef_oid(): new function, taking an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
mark_
c
omplete(): r
e
m
o
ve unneeded argumen
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
h
ael Ha
g
g
erty
mark_complete_o
i
d
(
): new function, taking a
n
objec
t
_oid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
clear_marks(): rewrite to t
a
ke an
obj
e
ct_id argu
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
mark_complete(): rewrite to take an object_id
argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
sen
d
_ref():
c
onvert local variable "
p
eeled" to obje
c
t_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
u
pload-
p
ack: re
w
r
i
te functions to take object_id
a
rguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Haggert
y
find_symref(): convert local variabl
e
"unused" to
o
bject_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Hag
g
er
t
y
find_symr
e
f(): rewrit
e
to take an object_i
d
argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
write_one
_
r
e
f(): rewrite t
o
t
ake an
object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
icha
e
l Hagger
t
y
write_refs_t
o
_temp_dir()
:
convert loca
l
v
ariable sh
a
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
su
b
module:
r
e
write to take an object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
sha
l
l
o
w:
rewrite
funct
i
ons
to take object_id argument
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el
H
ag
g
erty
ha
n
dle_one_
r
e
f
(
): r
e
write
t
o take an object_i
d
argu
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
add_info
_
ref():
r
ewrite to take an obj
e
ct_id
a
rgument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
han
d
le_one_
r
eflog(): rewrit
e
t
o
ta
k
e an object_id argum
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
r
e
gister_replace_re
f
(): rewrite to t
a
k
e an object_i
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
remo
t
e: rewrite funct
i
ons to take
o
b
j
ect_id
a
rguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next