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
P
aul Tan
pull --rebase: ex
i
t early when the workin
g
directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: configu
r
e --re
b
ase via branch
.
<
n
ame>
.
rebase or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
a
n
pull:
teac
h
g
it pull about --rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
p
u
ll:
set 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: implement pulling int
o
an un
b
o
rn
branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Ta
n
pu
l
l: fast-for
w
ard worki
n
g tree if head is up
d
ated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
p
u
ll: check if in unresolved mer
g
e state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pul
l
: support pull
.
ff config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
pu
l
l: err
o
r
on
no me
r
ge 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
T
an
pull: pass git-fetc
h
's optio
n
s to
g
i
t
-fetch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
u
ll: pass git-
m
erge's
opti
o
ns to git-m
e
r
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull:
pass ver
b
osity, --pr
o
gre
s
s
f
lags to
fetc
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
Paul Ta
n
pull:
i
mplement fe
t
ch
+ merge
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
ement skeletal buil
t
in 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
a
rgv-
a
rray: impleme
n
t argv_ar
r
ay_pushv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l
Tan
par
s
e-options-cb: impl
e
ment
p
ars
e
_opt_passthru_argv()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
u
l
T
a
n
pars
e
-
options-cb: implement pa
r
se_o
p
t_pa
s
sthr
u
()
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
H
a
m
ano
Sync with
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Gi
t
2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
ama
n
o
The
f
irst half of the
s
eve
n
th batc
h
for 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branch 'l
d
/p
4
-
e
dit
o
r
-
mu
l
ti-words
'
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o C Hama
n
o
Mer
g
e
branch 'bc/obj
e
ct-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branc
h
'jk/
a
t-
p
u
s
h-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
m
ano
M
e
r
g
e
b
ranc
h
'dl/branch-err
o
r-m
e
ssage' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio
C Ha
m
an
o
Me
r
g
e br
a
n
c
h
'jk/s
k
ip
-
http-tests-under-
n
o-cur
l
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'ps/d
o
c-packfile-vs-pack-file
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'fg/do
c
um
e
nt-com
m
it-messa
g
e-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e br
a
nch
'
jk/rerere-forget-check-enabled' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge
branch 'pt/
p
ull
-
lo
g
-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C Hamano
M
erge branch 'pt/pull-ff-
v
s
-
merge-ff' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hama
n
o
Merge bran
c
h 'rs/plug-leak-
i
n
-
pack
-
bitmaps'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
a
mano
Merge branch
'
ja/tutoria
l
-as
c
iidocto
r
-fix'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C H
a
mano
Mer
g
e branch 'jk/stripspace-asciid
o
ctor-
f
ix' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
H
a
mano
Merge branch 'jk/as
c
iidoc-mar
k
up-fix'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
H
amano
Merge branch
'
p
s/bundle-veri
f
y
-a
r
g' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'mh/write-refs-soo
n
e
r-2
.
4' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ran
c
h 'mh
/
re
f
-directory-file' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C H
a
mano
Merge branch 'mg/log-d
e
c
o
rate-HEAD' i
n
to
ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge
b
ranch 'sb/t1020-cleanup' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Haman
o
Merge br
a
nch 'jc/gitignore-precedence' into ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge br
a
nc
h
'b
c
/
c
onnect-plink' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Ha
m
a
n
o
Merge branch '
p
h
/rebase-
i
-r
e
do' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Ha
m
ano
Merge b
r
anch 'jk/add-e-kill
-
ed
i
tor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge bran
c
h 'mh/cl
o
n
e
-verbosity-fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge
b
r
anch 'jk/sha1-file-
r
educe-useless-warn
i
ngs
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C Hamano
Merge branch 't
b
/
blame-res
u
rrect-convert-to-g
i
t' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch 'jc/plug-
f
mt-mer
g
e-msg-leak' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
uni
o
C Ha
m
ano
Merge branch 'pt/xdg-config-path' into ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Sixth batch
for 2
.
5 cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge br
a
nch 'sb/test-bi
t
map
-
fre
e
-
at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Merge branc
h
'mm/rebase-i-post-rew
r
ite-exe
c
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
a
no
Mer
g
e branch 'fm/fetch-
r
aw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'sg/
h
e
l
p-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch 'mm/lo
g
-format-raw-d
o
c'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
M
er
g
e branch '
d
t/ca
t
-file-follow-syml
i
nks'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o
C Ha
m
a
n
o
Merge branch 'r
s
/jani
t
orial'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
aman
o
Merge branch 'jk
/
stash-options'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge branch 'da
/
mergetool-w
i
nmerge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
a
n
o
Merge
b
r
a
nch 'm
c
/commit-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio
C
Hamano
M
erge bran
c
h
'j
h
/filter-empty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge branch 'ah/
u
sage-str
i
ngs'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge bran
c
h 'jk/http-ba
c
kend-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge branch
'
dt
/
cl
e
an-pa
t
hspec-filter-the
n
-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
Merge branch
'nd/
u
ntracked-
c
a
che'
commit
|
commitdiff
|
tree
2015-05-27
Jeff Kin
g
t7
0
63: hide
s
tderr from
s
etup
i
nside prere
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
Syn
c
with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C H
a
mano
M
e
rge
bran
c
h '
j
k/still-interesting' into
main
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
M
e
rge branch '
j
c/hash-object' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge branch
'
jk
/
reba
s
e
-
quie
t
-no
o
p' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Mer
g
e b
r
a
nch
'sg/
c
o
mplete-dec
o
rate-full-not-lo
n
g
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
Merge
b
r
anch 'jk/filter-branch-use
-
o
f
-sed-
o
n-
i
ncomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hamano
Merg
e
branch
'
jc/daemon-no-ipv
6
-
for-2
.
4
.
1' int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
M
e
rge bra
n
ch
'jk
/
sta
s
h-
r
e
quire-
c
lean-index'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Merge branch 'jk/git-n
o
-more-argv0-
p
ath-munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Fifth batch
for
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
aman
o
Merge branch
'
nd/un
t
racked-c
a
che'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Merge branch 'rs/
p
lug-leak-in-pack
-
bi
t
m
aps'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'pt/pull-f
f
-vs-
m
erge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merg
e
branch 'pt/pull-
l
og-n'
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Ha
m
ano
Merge branch 'jk/rerere-f
o
rget-
c
he
c
k-
e
nabled
'
commit
|
commitdiff
|
tree
2015-05-26
Luke
D
i
a
m
a
nd
git-
p
4: tests: use
te
s
t-
c
hmtime in plac
e
of to
u
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge b
r
anc
h
'jk/
h
t
tp-backend-deadlo
c
k-2
.
3'
i
n
to
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
erge
branch
'
jk/http-backend-deadlock
-
2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff K
i
ng
http-bac
k
end: s
p
oo
l
ref ne
g
o
tiati
o
n r
e
ques
t
s to buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
s
t
r
u
c
t
ref
_
lock: con
v
ert old_sha1 member to
o
bject_
i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
warn_i
f
_dan
g
ling_symre
f
():
c
onvert
l
ocal vari
a
ble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
Haggerty
e
a
ch_re
f
_fn_adapter(): remove adapter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
rev_list_insert
_
ref()
:
r
e
m
ove unneeded arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
rev_list_insert_r
e
f_oid(): new fu
n
c
t
ion,
t
ak
i
ng an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
mark_com
p
le
t
e():
r
emove unneeded arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Ha
g
gerty
mark_complete_oid(): n
e
w function, taking
a
n obje
c
t_oid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
clear_
m
arks():
rew
r
it
e
to take an object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Haggerty
mark
_
complete()
:
rewrit
e
to take an obje
c
t
_
i
d
a
rgument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
s
e
n
d
_
ref(): convert local variable "peeled" to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Hagge
r
ty
upload-pack: rewr
i
t
e
f
un
c
tion
s
t
o
ta
k
e objec
t
_id argum
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
a
el Haggerty
fi
n
d_
s
y
m
ref()
:
conv
e
r
t l
o
cal variable "unused
"
to object
_
i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
find_symref
(
): rewrite
t
o t
a
k
e
an
o
bject
_
id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
H
aggerty
w
r
ite_one_ref
(
): rewrite to take an obje
c
t_id
argumen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
wri
t
e_refs_to_temp_di
r
()
:
con
v
ert local
v
ar
i
able sha1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next