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 --rebase: exit early when the working directory is dirty
2015-06-18
Paul Tan
p
ull --rebase: exit early when the working dire
c
tory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: c
o
nfi
g
u
r
e --
r
ebas
e
via
branch
.
<name>
.
r
e
ba
s
e
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: teach git pull
abou
t
-
-
rebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: 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 pulling in
t
o a
n
unborn
branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull
:
fast-forward wor
k
ing tree if head
is updated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l Tan
p
u
ll: check if in
u
n
res
o
lved merge sta
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: support pull
.
f
f
c
onfig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l
T
an
pull: error on no merge can
d
idates
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 gi
t
-fetch's opt
i
ons to git-fetch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
pull
:
pass g
i
t-merge's options
t
o git-m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull:
pass
v
e
rbos
i
ty, --prog
r
ess
f
lags to fet
c
h and
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
pull: imp
l
e
m
ent f
e
t
c
h
+ 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 Tan
p
ull: im
p
lemen
t
skeletal
b
uiltin pull
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
T
an
argv-a
r
ray: implement ar
g
v_a
r
ray_
p
u
sh
v
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
arse-options-cb:
i
mplement pars
e
_opt_pa
s
sthr
u
_argv
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pars
e
-options-cb:
i
m
p
l
e
ment par
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
S
ync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Git
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
T
h
e f
i
rst half of the seven
t
h batch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ha
m
ano
Merge branch 'ld/p4-editor-mul
t
i-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ha
m
a
n
o
M
erge b
r
anch
'bc/o
b
je
c
t-id
'
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Haman
o
M
e
rge branch 'jk/at-push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Hamano
Mer
g
e b
r
anch 'dl/br
a
n
c
h
-
e
r
ror-message'
i
nto
m
ai
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C Ha
m
ano
M
e
rge branch 'jk/skip-h
t
t
p-t
e
s
ts-un
d
er-no-curl'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
M
erg
e
branch 'ps/doc-packfile-v
s
-pack-fil
e
' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'fg/d
o
cument
-
comm
i
t
-
message-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merge branch 'jk/re
r
ere-forget-check-en
a
bled' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ha
m
ano
Merge b
r
anch
'p
t
/pull
-
l
o
g
-n
'
int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branch 'pt/pull-ff-vs-mer
g
e-ff' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
H
a
m
ano
M
erge bran
c
h
'rs/plug-leak
-
i
n-pack-bitmap
s
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
bran
c
h 'ja/tut
o
rial-asciido
c
tor-fi
x
' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
H
am
a
no
Merge branch 'jk/st
r
ipsp
a
ce-asciidoc
t
or-fi
x
' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge
b
ranch 'jk/asci
i
doc-markup-fix'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'ps/b
u
ndle
-
verif
y
-arg
'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge bra
n
c
h 'mh/
w
rite-refs-soon
e
r
-
2
.
4' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'mh/ref-directo
r
y-f
i
le' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Mer
g
e
branch 'mg/l
o
g-decorate-HEAD'
i
nt
o
ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'sb
/
t1020-
c
lean
u
p'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch
'
jc/gitignore
-
prece
d
e
nce' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branc
h
'bc/connect
-
p
l
ink' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C Ha
m
ano
M
erge br
a
nch 'p
h
/rebase
-
i-redo' into
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branch 'jk/add-e-kill-
e
ditor' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'mh/clone-verbosity-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge b
r
a
n
ch 'jk/sha1-file
-
reduce-usele
s
s-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branch 't
b
/blame-re
s
ur
r
ect-
c
onvert-to-
g
it' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
amano
Merge
br
a
nch
'
jc/plug-fmt-merge-
m
s
g
-leak' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Ham
a
no
Me
r
ge bran
c
h 'pt/x
d
g-
c
onf
i
g-path' int
o
maint
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C
H
amano
Sixt
h
b
atch for 2
.
5
c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge bra
n
ch 'sb/
t
est-b
i
tmap-f
r
e
e
-at-end'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Haman
o
Me
r
ge bran
c
h '
m
m/rebase-i-post-rewrite-e
x
e
c
'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o
C
Hamano
Merge branch 'fm/f
e
tch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge b
r
anch
'
sg/help-group'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C H
a
mano
Merge branch 'mm/log-f
o
rmat-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'dt/cat
-
file-follow-sy
m
links'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
a
m
a
no
Merge branch 'rs/jan
i
torial'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C
H
amano
Me
r
ge branch 'jk/
s
tash
-
o
p
tions'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o C
H
amano
Me
r
ge branch 'da/me
r
get
o
ol-wi
n
merge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge branch 'mc/c
o
mmit
-
doc-gr
a
mmo
f
ix'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge b
r
anch
'
j
h/filter-e
m
pty-contents'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hama
n
o
Mer
g
e branch 'ah/
u
sage-str
i
ngs'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge
bra
n
ch
'
jk/http-backend
-
dead
l
ock'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge branch 'd
t
/clean-pathspec-
f
i
l
t
er-then
-
lsta
t
'
commit
|
commitdiff
|
tree
2015-05-27
Junio
C
Hamano
Merge
b
ranch
'nd/
u
ntrac
k
ed-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
ing
t7
0
63:
h
ide stderr from setup inside prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
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 Ham
a
no
Merge branch 'j
k
/still-
i
nteresting' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Mer
g
e branch 'jc
/
ha
s
h-objec
t
' into main
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
rge branch 'jk
/
rebase-quie
t
-noop'
into mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
M
erge branch 'sg/comp
l
e
t
e-decorate-full
-
not-lon
g
' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Merge b
r
anch 'jk/
f
ilt
e
r-branch-us
e
-of-sed-on
-
incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Merge bra
n
ch
'jc/daem
o
n-no-ip
v
6-fo
r
-2
.
4
.
1' into maint
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
M
e
rge bra
n
ch
'jk/stas
h
-r
e
quire-clean-index' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk/git-no-mo
r
e-argv0-pa
t
h-munging'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
F
ifth ba
t
ch
f
o
r 2
.
5
cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge br
a
nch 'nd/
u
nt
r
acke
d
-cache
'
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Ha
m
ano
Merge br
a
nc
h
'rs/plug-le
a
k-in-pack
-
bitmaps'
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
Me
r
ge b
r
anch
'
pt/pull-ff-
v
s-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
Merge branch 'pt/pull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
J
un
i
o
C
H
amano
Merge
bra
n
ch 'jk/rerere-forget-ch
e
ck-enabled'
commit
|
commitdiff
|
tree
2015-05-26
L
u
k
e Diamand
git-p4:
tests: use tes
t
-
c
h
mtime in pl
a
ce of touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bran
c
h 'jk/http-backend-deadl
o
ck-
2
.
3
' in
t
o jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Merge
branc
h
'jk/http-bac
k
end-deadlock-2
.
2' into
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
h
ttp-backend: spool ref negotiation requests t
o
buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
st
r
uct ref_lock: conve
r
t old_sha1
m
ember to ob
j
e
c
t_
i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
warn_if_dangling
_
symref():
c
on
v
er
t
local variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
H
a
ggerty
each_r
e
f_fn_adapter(): remove adapte
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
ha
e
l Haggerty
re
v
_
lis
t
_insert_ref():
r
e
move unneeded arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichae
l
H
a
ggerty
rev_list
_
insert_ref_oid(): new functi
o
n, taking an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
mark_complete(): remove unneeded arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Ha
g
gerty
m
ark_complete_oid(): new fu
n
c
t
io
n
, taking an object_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
H
aggerty
clear
_
marks():
r
ewrite to take an object_
i
d ar
g
umen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael
Haggerty
mark_complete():
r
ewri
t
e
to
t
ake a
n
object_id arg
u
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael
Hagger
t
y
send_ref():
c
onvert
l
ocal variable "peeled" to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael
H
aggerty
upl
o
ad-pack
:
r
e
w
r
ite f
u
nctions to take object_id arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichae
l
Haggerty
find_symref(): convert l
o
cal
v
ariable "unu
s
ed" to
o
bject_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
find_symref(
)
:
r
e
write to take an obj
e
ct_i
d
ar
g
ument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ich
a
el Haggerty
w
rite_one_ref():
r
ewrite t
o
take an object_id
a
r
gument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
agge
r
ty
wr
i
te_refs_to_temp
_
dir(): co
n
vert local variable
s
ha1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next