repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
pull: enclose <options> in brackets in the usage string
2015-10-16
Alex Henrie
pull: enclos
e
<
options> in br
a
ck
e
ts i
n
the u
s
age string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-10-02
Alex Henrie
merge
:
g
r
a
mmof
i
x
in pl
e
ase-commi
t
-befo
r
e-merge message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
aul T
a
n
pull: remove redirection t
o
git-p
u
ll
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul
T
an
pull --r
e
bas
e
: error on n
o
merge candidate case
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull --rebase: exit early when the wo
r
king
d
irectory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: configu
r
e --re
b
ase
v
ia branc
h
.
<
na
m
e>
.
rebase or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
l
l: teach git pu
l
l about
--rebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: s
e
t reflog m
e
ssage
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: implemen
t
p
u
l
ling into an unborn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: fas
t
-forward w
o
r
k
i
n
g tre
e
i
f
h
ead is updated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: check
if in un
r
esolved mer
g
e state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
p
u
ll: suppo
r
t
pull
.
ff config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul 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 Ta
n
pull:
pass git-f
e
tch'
s
options t
o
git-fe
t
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
pull: pass git-merg
e
's o
p
tions to git-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Ta
n
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
P
a
u
l Tan
pull: impl
e
ment f
e
tch + 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
Paul
T
an
pull:
implement skeletal
bu
i
ltin 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-arra
y
: im
p
lem
e
n
t argv_array_push
v
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Ta
n
p
a
r
se-op
t
ions-cb: imple
m
ent parse_opt
_
passthru_argv()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
parse-options-
c
b: implemen
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 Hama
n
o
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
T
h
e f
i
rst half of the
se
v
e
nth
b
atch
f
or 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge branch 'ld/p4-editor-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'bc/objec
t
-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
ma
n
o
M
e
r
g
e
branch 'jk
/
at-push-sha1
'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merge branch 'd
l
/br
a
n
ch-error-messag
e
' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Ham
a
no
Merge branch 'jk/skip
-
http-
t
e
sts-
u
nder-no-curl'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
un
i
o C Hamano
Merge branc
h
'ps/doc-packfile-vs-pack
-
f
i
l
e' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C H
a
mano
Merge bra
n
ch 'f
g
/docu
m
ent
-
commit-message-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge br
a
nch
'jk/re
r
e
re-forget-che
c
k-
e
n
a
bled' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'pt/pull-log-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
p
t/p
u
ll-ff-vs-merge-ff' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch 'rs/
p
lug-leak-in-pack-bitmaps' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Haman
o
Merge bran
c
h
'j
a
/tu
t
orial-as
c
iidoctor-fix'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merg
e
branch 'jk/stripspace
-
asciidoct
o
r
-fix' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge bran
c
h
'jk/asciid
o
c-markup-fix
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C
H
a
mano
Merge br
a
nch 'ps/b
u
ndle-ve
r
i
fy
-
arg'
i
nto m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Merge branch 'mh/write
-
refs-sooner-2
.
4' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge b
r
a
n
ch 'mh
/
r
ef
-
directory-
f
ile' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merg
e
branch '
m
g/log-de
c
orate
-
HEAD' i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Ham
a
no
Merge bran
c
h 'sb/t1020-cl
e
anup' into
ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge branch
'jc/gitignore-precedence' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branch 'bc
/
connect
-
plink' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C
H
amano
Merge b
r
anch 'ph/rebas
e
-i-
r
edo' into
m
ain
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch 'jk/add-e
-
kil
l
-ed
i
tor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Mer
g
e branc
h
'mh/clone-verbosity-fix' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
H
a
m
a
no
Merge b
r
a
nch 'jk/sha
1
-file-reduce-useless-
w
arni
n
gs
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C
Hamano
Merge branch 'tb/bl
a
me-resurrect-convert-to-gi
t
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merg
e
branch
'jc/p
l
ug-f
m
t-merge-msg-leak' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'pt/xdg-config-
p
ath'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Ha
m
a
no
Si
x
t
h batch for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
M
e
rge br
a
nch
'sb/test-bitmap-fre
e
-
at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Merge branch
'mm/rebase-i-po
s
t-re
w
r
i
te-ex
e
c
'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C H
a
mano
Merge branch '
f
m/fet
c
h-ra
w
-sha
1
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merg
e
branch 'sg/hel
p
-group'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o
C Hamano
Merge branch 'mm/log-form
a
t-ra
w
-do
c
'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Ha
m
ano
M
e
rge branch
'
dt/
c
at-file
-
fo
l
l
ow-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge b
r
anch '
r
s
/jan
i
tor
i
al'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
erge branc
h
'jk/stash-o
p
tions'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
m
a
n
o
Merg
e
branch 'd
a
/me
r
g
e
tool-winm
e
rg
e
'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Mer
g
e
b
r
a
n
ch 'mc
/
commit-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io C Hama
n
o
Merge branch 'j
h
/
filter-em
p
ty-cont
e
n
ts
'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o
C Hamano
Merge branc
h
'ah/usage-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e branch 'jk/http-ba
c
kend-deadl
o
ck'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Ha
m
ano
Merge
bran
c
h '
d
t/c
l
ean-pat
h
spec-filter-the
n
-
lst
a
t'
commit
|
commitdiff
|
tree
2015-05-27
Junio C Ha
m
ano
Merge bran
c
h 'nd/untracked-ca
c
h
e
'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7063: hide stderr fro
m
setup insi
d
e prer
e
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Ham
a
no
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-in
t
erestin
g
'
into maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C Ha
m
a
no
Me
r
ge b
r
anch '
j
c/ha
s
h-
o
bject' int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branc
h
'jk/rebase-quiet-noop'
into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
erge branch '
s
g/complete-dec
o
rate-full-not-long'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C
Hamano
Mer
g
e
branch 'jk/filter-bra
n
c
h
-use-of-sed-on-incomplet
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
Merge
br
a
nch 'jc/daemo
n
-no-ipv6-for
-
2
.
4
.
1' into maint
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
M
erge bra
n
ch 'jk/stash-require-clean-index' into
m
a
int
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Ham
a
no
Merge branch 'jk/gi
t
-no-more-argv0-path-
m
unging'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Fifth batc
h
for 2
.
5
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Me
r
g
e b
r
anch 'nd/untra
c
ked-c
a
che'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branc
h
'rs/p
l
ug-leak-i
n
-pack-bi
t
maps'
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hama
n
o
Me
r
ge bra
n
ch 'pt/pull-ff-vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Merge
b
r
anch '
p
t/pull-
l
og-n'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
b
r
a
nc
h
'j
k
/re
r
ere-forget-check-ena
b
led'
commit
|
commitdiff
|
tree
2015-05-26
Luke D
i
amand
git-p4: tests: use test-chmtime in place of touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
b
ranch
'jk/http-backend-dea
d
lock-2
.
3' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
M
e
rge branch 'jk/http-backend-de
a
dlock-2
.
2'
i
nto jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
http-back
e
nd: spool ref n
e
gotiation requests to b
u
ffe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Hagg
e
rty
stru
c
t ref_lock: conver
t
old_sha1 member to object
_
id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Hagg
e
rty
w
arn_if_dangling_symr
e
f(): convert local vari
a
ble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
each_ref_fn
_
adapter():
remov
e
adapter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
rev_list_i
n
sert_ref(): remove unn
e
e
d
e
d a
r
guments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
rev_list_in
s
ert_ref_oid(): new function
,
taking an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
r
t
y
mark_complete():
r
emove unn
e
eded argumen
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
mark_com
p
lete_oid():
n
ew function, taking an object_o
i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
clear_m
a
r
ks
(
): re
w
ri
t
e
to take
a
n
o
bject_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
mar
k
_complete():
rewrite to take an
object_id
a
r
gument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
send_ref(): convert
l
ocal var
i
a
b
le "peeled
"
to ob
j
ect
_
id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
e
l Haggerty
uplo
a
d-p
a
ck: re
w
rite functions to take object
_
id argu
m
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next