repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
pull: check if in unresolved merge state
2015-06-18
Paul Tan
pull: che
c
k
i
f in unre
s
olved merge state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pul
l
:
s
upport pull
.
ff config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull: e
r
ror 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
P
aul Tan
pu
l
l: pass git-fetch'
s
op
t
ions to git-fetch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
u
l
T
an
p
ull
:
pass
g
it-merge
'
s
o
p
ti
o
ns to git-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
pull
:
pas
s
verbosity,
--pro
g
ress 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
P
aul
Tan
pul
l
:
i
mplemen
t
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
Ta
n
p
ull: imple
m
ent sk
e
letal 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
Paul
Tan
argv-array: implement a
r
gv_array_pushv()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Ta
n
parse-o
p
ti
o
ns-cb: implement parse_op
t
_passthru_ar
g
v()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
a
rse-options-cb: i
m
pleme
n
t pa
r
s
e
_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 Hamano
Syn
c
with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C Hamano
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
ma
n
o
The fi
r
st
half of the
seventh batch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
amano
Merge
b
ranch 'ld/p4-editor-multi-w
o
rds'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch 'b
c
/object-id'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Mer
g
e branch
'jk
/
a
t-push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C Hamano
Me
r
g
e
b
r
anch 'dl/b
r
anch-error-mess
a
ge'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge bran
c
h 'jk
/
skip
-
http-tests-under-no-curl
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Ha
m
ano
M
e
rge branch
'
ps/doc-pac
k
file-vs-pack-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch '
f
g/d
o
cume
n
t-c
o
mmit-m
e
s
sage-
s
trippi
n
g
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch '
j
k
/
r
erere-for
g
et-
c
heck-
e
nabled'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C
Hama
n
o
Merge branch 'pt/p
u
ll-
l
og-n' into main
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o
C H
a
mano
Merge branc
h
'
pt/pull
-
f
f-vs-merge
-
ff' i
n
to main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
man
o
Me
r
g
e
branch 'rs/plug-leak-in-pack-bitmap
s
' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
M
erg
e
branch 'ja/tut
o
rial-asciidoctor-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch '
j
k/strip
s
pace-as
c
iidoc
t
or-fix' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Ha
m
ano
M
erg
e
branc
h
'jk/asciidoc-ma
r
kup
-
fix' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merg
e
branch
'
p
s
/b
u
ndl
e
-verif
y
-
arg' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge bran
c
h 'mh/wri
t
e-refs
-
sooner-2
.
4'
in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C Ham
a
n
o
Merge branch 'mh/
r
ef-di
r
ector
y
-fil
e
'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch 'mg/log-decorate-
H
EAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
M
erg
e
branch 'sb/t102
0
-cle
a
nup' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge br
a
nch 'jc/
g
itignore-preceden
c
e' in
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
H
amano
M
e
rg
e
branch 'bc/connec
t
-plink' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
r
anch 'ph/
r
eba
s
e-i-redo' into main
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o
C Hamano
Merge branc
h
'jk/add-e-kill-editor
'
in
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branc
h
'
mh/clone-verbosity-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'jk/sha
1
-file
-
r
e
d
uc
e
-useless-warnin
g
s
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
an
o
M
er
g
e b
r
an
c
h 'tb/blame-resurre
c
t-convert-to-git'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C H
a
mano
Me
r
ge bran
c
h 'j
c
/plug-fmt-merge-msg
-
le
a
k' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e bra
n
c
h
'
pt/xdg-confi
g
-pa
t
h' into main
t
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
Sixth
b
atch for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C
H
amano
Merge branch 'sb/
t
est-bitmap-free
-
at-
e
nd
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
a
m
a
n
o
Merg
e
branch
'm
m
/rebase
-
i-post-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
Merg
e
branch 'fm/f
e
tch-raw-sh
a
1'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
M
erge
b
ra
n
c
h
'sg/
h
elp-gr
o
up'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge br
a
nch
'
mm/log-format-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o
C Hamano
Merge branch 'dt/cat-file-foll
o
w-symlin
k
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
M
e
rge branch 'rs/jan
i
torial
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merg
e
branch 'jk/stash-option
s
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge br
a
n
ch 'da/merg
e
to
o
l-winm
e
rg
e
'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Ha
m
a
no
Merge br
a
nch 'mc/co
m
mit-do
c
-grammofix
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
a
m
a
no
M
erge
branch 'jh
/
filter-empty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
mano
Merge branc
h
'a
h
/
u
sage-
s
trin
g
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
erge bran
c
h 'jk/
h
ttp-backend
-
d
eadlock
'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Merge branch
'dt/clean-pathspec-fi
l
t
e
r-then-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Ju
n
io C Hamano
M
erge branch
'
nd/untracked
-
cache'
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f King
t
706
3
:
h
ide
s
tderr from setup in
s
i
de prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio
C
Hamano
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Git 2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merg
e
branch 'j
k
/still
-
i
nter
e
sting' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jc/
h
ash-obj
e
ct' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Me
r
g
e
b
r
a
n
c
h 'jk/rebase-quie
t
-noop'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'sg/complete-de
c
orate-full-not-long
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio
C
Hamano
Merge branch 'jk/filter-branch-
u
se-of-sed
-
on-
i
ncomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch
'
jc
/
daemon-n
o
-ipv6-for
-
2
.
4
.
1
'
into
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk/stash
-
require-clean-index' i
n
to
maint
commit
|
commitdiff
|
tree
2015-05-26
J
unio
C Hamano
Merg
e
branch 'jk/git-no-more-
a
r
g
v0-path-mung
i
ng' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Ham
a
no
Fift
h
batch for 2
.
5
cyc
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
Merge branch 'nd/
u
ntra
c
ked-cache'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
branch 'rs/plug-l
e
a
k
-in-
p
ack-bitmaps'
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C Hamano
Merg
e
b
ra
n
ch 'pt
/
pull-ff-vs
-
merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hama
n
o
Merge branc
h
'pt/pull-log-n
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
m
ano
Merge bra
n
ch 'jk/rerere-forg
e
t-check-enabl
e
d'
commit
|
commitdiff
|
tree
2015-05-26
Luke D
i
amand
g
i
t-p4: tests
:
use test-chmtime in p
l
ace
of touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio
C
Hamano
Merge branch 'jk/http-backend-
d
e
a
d
lock-2
.
3
'
int
o
jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
M
erge
branch 'jk/http
-
ba
c
kend-de
a
dlock-2
.
2
'
into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
eff King
http-back
e
nd
:
spool ref negotiation
r
equests
to buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
struct ref_lock: convert old_sha1 me
m
ber to obj
e
c
t_i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Hagger
t
y
warn_if_dangling_s
y
mref
(
): convert local variabl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Hagge
r
ty
e
ach_ref_
f
n_adap
t
er()
:
remove a
d
apte
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
rev_list_i
n
sert_
r
ef():
re
m
ove
unneeded argumen
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
rev_list_i
n
sert_ref_oid(): new f
u
nction, ta
k
ing
a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
mark_complete(): remove
unneeded argument
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
h
a
e
l
Hagg
e
rty
m
a
rk_c
o
m
plete_oi
d
(
)
:
n
ew func
t
i
o
n
, t
a
king an
o
bject_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
ch
a
e
l
H
a
ggert
y
cle
a
r_marks(): rew
r
it
e
t
o take an ob
j
ec
t
_
i
d
a
rg
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Haggerty
mark
_
comp
l
ete(): r
e
write
to take an
o
bject_id argum
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
send_ref
(
)
:
convert
l
ocal vari
a
ble
"
peeled" to objec
t
_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
u
p
load-pack:
r
ewrite functions to take object_id arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
f
i
nd_symr
e
f(): convert l
o
cal
variab
l
e "unused" to obj
e
ct_
i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
find_symref
(
):
r
e
w
r
ite to
ta
k
e a
n
object_id argume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Hagge
r
ty
write
_
one_ref(): rewri
t
e
t
o take an
object_id arg
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
write_refs_to_temp_dir(): convert local variable
sha1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
g
g
erty
subm
o
dule: r
e
w
r
i
t
e to
take an obj
e
ct_
i
d argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
er
t
y
shallow: rew
r
i
te
f
u
nctions to take object_id arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
h
ael
Hagger
t
y
handle_one_ref(
)
: rewrite
t
o take
a
n object_id argum
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
add_info_ref(): rewri
t
e to take an obje
c
t_i
d
argum
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael
Hag
g
erty
h
andle_one_
r
e
f
log
(
)
:
rewr
i
te
t
o
take an obje
c
t
_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael
H
a
g
ge
r
ty
register_replace
_
ref(): rewrite to take an object_id
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next