repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
pull: error on no merge candidates
2015-06-18
P
aul Tan
pu
l
l: error on no merge candi
d
ates
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
an
p
ull
:
pa
s
s git-fetch's options to git-fetch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
pull:
p
ass git-merg
e
's opti
o
ns to git-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: pass ve
r
bosity, --progres
s
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
p
ul
l
: implemen
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
Paul Ta
n
pull: implement
s
keletal bu
i
ltin pul
l
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
Tan
a
rgv-array: i
m
plement argv
_
array_push
v
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pars
e
-options-cb: imple
m
ent parse
_
opt_passthru_argv()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l
Tan
parse-opt
i
ons-cb: implement parse_op
t
_pas
s
thr
u
()
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Gi
t
2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
The firs
t
half of th
e
seventh batch
for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge branch 'ld/
p
4-editor-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merge bran
c
h 'bc/
o
bject
-
id
'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch '
j
k/a
t
-push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
n
o
Mer
g
e b
r
anch 'd
l
/branch-error-
m
e
s
sage' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
M
er
g
e br
a
nch 'j
k
/skip
-
http-tes
t
s-un
d
er-no-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
M
erge
b
ranch 'ps/doc-pac
k
fi
l
e-vs-pack-file' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'fg/documen
t
-commit-
m
essage-s
t
ripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'jk/rerere-forget-c
h
e
ck-enabled' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Me
r
ge branch 'pt
/
pull-log-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
Hama
n
o
Merge branch 'pt/pull-ff-vs-
m
erge-ff' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C Hamano
Mer
g
e branch 'rs
/
pl
u
g-le
a
k-in-pack-bitmaps' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch
'
ja/t
u
toria
l
-asciido
c
tor-fix'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Haman
o
Me
r
ge
branch 'jk/stri
p
s
pac
e
-as
c
i
idoctor-fix
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hama
n
o
Me
r
ge br
a
n
ch 'j
k
/a
s
ciido
c
-markup-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
uni
o
C Hamano
Merge branch '
p
s/bund
l
e-veri
f
y-arg' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ham
a
no
Merge br
a
nc
h
'mh/
w
rite-refs-so
o
n
er-2
.
4'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch
'mh/ref-directory-file' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Me
r
g
e
branch 'mg/log-decorate-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'sb
/
t102
0
-cleanup' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Hama
n
o
Merge branch 'jc/gitignore-
p
recedence
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
H
am
a
no
Merg
e
b
r
anch 'bc/connect-
p
link' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge
b
ranch 'ph/rebase-i-
r
ed
o
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge
b
ran
c
h 'jk/add-e-kill-editor' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hama
n
o
Merge branch 'm
h
/clon
e
-verb
o
sit
y
-fix' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge b
r
anch
'jk
/
sha1-file-reduce-usel
e
ss-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge
bran
c
h
'
t
b/blam
e
-r
e
surrect-
c
onvert-t
o
-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge bra
n
ch 'jc/plug
-
fmt
-
merg
e
-
msg-leak
'
i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge br
a
nch 'pt/xdg-
c
onfi
g
-path'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hama
n
o
Si
x
th batch
f
o
r 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io
C
Hamano
Merge bra
n
ch 'sb/test-bitmap-fre
e
-at
-
end'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hama
n
o
M
e
rge br
a
nc
h
'
m
m/rebase-i-po
s
t-
r
ewrit
e
-
ex
e
c'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge bran
c
h 'f
m
/fetch-raw-
s
ha1'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Ha
m
ano
M
erge bra
n
c
h 'sg/help
-
group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'mm/log-format-raw-doc
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
a
mano
Merge branch 'dt/cat-file-fo
l
l
ow-sy
m
l
ink
s
'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge
branch
'
r
s
/jan
i
torial'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C
Hamano
Merge br
a
n
c
h 'jk/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merg
e
branch 'da/mergetool-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C H
a
ma
n
o
Me
r
ge
br
a
nch
'mc/commit-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C
H
amano
Merge b
r
anch 'jh/f
i
lte
r
-e
m
pty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o C Hamano
Mer
g
e branch 'ah/usage-strings'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Ham
a
n
o
Mer
g
e branch 'jk/http-b
a
ckend-deadlock
'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Ha
m
ano
Merge
b
r
an
c
h 'd
t
/clean-pathsp
e
c-fil
t
e
r-then-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Jun
i
o
C Hamano
Merge branch 'nd/untracked-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff K
i
ng
t7063: h
i
de stderr from setup insid
e
prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C
H
amano
Sync
with 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
Junio C Hamano
Merge branch
'
jk/still-interestin
g
' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Ha
m
ano
Merge branch 'jc/hash-object'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
m
a
no
M
erge branch
'
jk/rebase-quiet-noop' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bran
c
h 'sg/co
m
plete-deco
r
ate-full-not-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bran
c
h 'jk/filt
e
r-branch-
u
se
-
of-sed-on-inc
o
mpl
e
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Merge branc
h
'jc/daemon-
n
o-ipv6-
f
or
-
2
.
4
.
1' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge
b
ranch 'jk/stash-require-clean-index' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
branch 'jk/git-no
-
mor
e
-argv0-path-munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C
H
amano
Fif
t
h
batch for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
r
ge branch '
n
d/untra
c
k
e
d-ca
c
he'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'rs/
p
lug-lea
k
-in-pack-b
i
tmaps'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hamano
Mer
g
e branch 'pt/pull-ff-vs-merge
-
ff'
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Haman
o
Merge branch 'pt/pull-l
o
g-
n
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Merge branch
'
jk/re
r
ere-f
o
rge
t
-check
-
enabled'
commit
|
commitdiff
|
tree
2015-05-26
Luke
D
iamand
g
i
t-p4:
tests: use
t
est-c
h
mtime
i
n
pl
a
ce of touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Me
r
ge
b
ranch 'j
k
/
h
ttp-
b
a
ckend-deadlock-2
.
3
'
into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
b
ranch
'
jk/http-back
e
nd-deadloc
k
-
2
.
2' in
t
o jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
eff King
htt
p
-backend: spool ref nego
t
iatio
n
req
u
e
sts to buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
e
r
t
y
struc
t
r
e
f_lo
c
k: con
v
ert o
l
d_sha1 member to obje
c
t_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
warn_if_dang
l
in
g
_symref(): c
o
nvert
l
o
c
a
l va
r
iable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggert
y
ea
c
h_re
f
_f
n
_adapter
(
): remove adapter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
rev_lis
t
_insert_
r
ef(): rem
o
ve unneeded a
r
g
um
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Ha
g
ge
r
ty
rev_list_i
n
sert_re
f
_
oid(): new funct
i
on, taking an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Hagg
e
rty
mark_complete():
r
emove unneede
d
arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
ge
r
ty
mark_com
p
lete_oid(): new functio
n
,
t
a
king an obje
c
t_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
gger
t
y
c
lear_marks():
rewrite
to ta
k
e an object_id arg
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
erty
mark_complete
(
)
: rewri
t
e to take
a
n object_id argum
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
r
ty
send_ref(): conv
e
rt l
o
cal
v
ariabl
e
"peeled
"
to
object_i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
gger
t
y
upload-pack: rewrite
f
u
n
c
tion
s
to take object_id
argumen
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
fin
d
_symref(): convert local variabl
e
"unused"
to o
b
ject_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
find
_
symref(): re
w
rite
t
o take an
object_id ar
g
um
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Haggerty
wri
t
e
_
o
ne_
r
ef():
rewri
t
e to
t
ake an object_
i
d argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
write_ref
s
_to
_
temp_dir(): conve
r
t loca
l
varia
b
le sha1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Hagge
r
ty
subm
o
dul
e
: rewrite to
t
a
k
e
an object_i
d
argu
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ic
h
ael Haggert
y
shallow: rewrite functions
to tak
e
object_id arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
g
g
erty
handle_one_ref():
rewrit
e
to take an object_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Hag
g
erty
add_info_r
e
f
(): rewrite to take
a
n object_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
h
a
ndle
_
one_reflog()
:
rewrit
e
to ta
k
e
a
n o
b
ject
_
id argu
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
h
a
e
l Hag
g
erty
regi
s
ter_
r
eplace_ref(): rewri
t
e to
take an object_id
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
remote: rewrite functio
n
s
t
o ta
k
e object_id arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Hagg
e
rty
add_
o
ne_ref(): rewrite to t
a
ke an ob
j
e
ct_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next