repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
pull: teach git pull about --rebase
2015-06-18
Paul Tan
pul
l
: teach git pull ab
o
ut --rebas
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
s
et reflog me
s
s
age
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
p
ull: implement pulling into an unborn br
a
n
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Ta
n
pu
l
l: fast-forward working tree if h
e
ad is updated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pu
l
l: check if in unreso
l
ved m
e
rge state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: s
u
pp
o
rt
p
ull
.
ff config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull: error on no merg
e
c
a
ndidates
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
pu
l
l: pass
g
it-
f
etch's o
p
tions to gi
t
-fetch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul
T
an
pull: pa
s
s git-merge's o
p
tions to git
-
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
pul
l
: pa
s
s verb
o
s
ity
,
--progr
e
s
s
flags to
f
e
t
c
h
an
d
.
.
.
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
pul
l
: implemen
t
f
e
t
c
h + 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 Tan
pull:
implem
e
nt
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
P
a
ul Tan
a
r
gv-arr
a
y: i
m
plement a
r
gv_array_pushv()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
parse-options-cb: im
p
l
e
men
t
parse_opt_passth
r
u_argv()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
u
l
Tan
parse-o
p
t
i
ons-cb: i
m
p
lemen
t
p
ars
e
_
opt
_
pa
s
s
t
hru()
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 Ha
m
ano
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C Ham
a
no
The first h
a
lf
o
f
the seventh batch for
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Me
r
ge
b
ranch 'ld/p4-
e
dit
o
r-m
u
lti-word
s
'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge
branch
'
bc/object-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge bran
c
h
'
j
k/at-pus
h
-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branch 'd
l
/
branch-error
-
messa
g
e' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C H
a
m
an
o
Merge
bran
c
h 'jk/sk
i
p-http-
t
est
s
-under-
n
o-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Merge bran
c
h 'ps/doc-pa
c
k
file-vs-pack-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
a
mano
Merge bran
c
h 'fg/document-commit-m
e
ss
a
ge-s
t
ripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branc
h
'jk/rerere-forge
t
-check
-
enable
d
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branch 'pt/
p
ull-lo
g
-
n
' into
main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bra
n
ch 'pt/pull-
f
f-vs-
m
e
rge-ff' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
Hamano
Merge
branc
h
'rs/plug-lea
k
-in-pack-bi
t
maps' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
M
erge b
r
anch '
j
a/tut
o
rial-asc
i
idoc
t
or-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch 'jk/stri
p
space-asc
i
idoctor-f
i
x' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge branch 'jk/asciidoc-markup-f
i
x
'
int
o
m
ain
t
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Haman
o
M
erge bran
c
h
'
ps/bu
n
dle-verify-arg' int
o
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merge branch 'mh/wri
t
e-refs-so
o
n
er-2
.
4' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch 'mh/re
f
-
d
i
rectory-f
i
le' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge bran
c
h 'mg/log-decorate
-
H
E
AD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch
'
s
b/
t
1020-cleanup' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge
b
ranch
'jc/gitignore-precedence' into ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Me
r
ge branch 'bc/connect-plink' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge bra
n
c
h 'ph/rebase-i-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
branch 'jk
/
add-e-
k
i
ll-editor'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Mer
g
e b
r
anc
h
'mh/clo
n
e-verbosity-fix' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
J
uni
o
C Hama
n
o
M
erge branch 'jk/sh
a
1
-
file-
r
e
d
u
c
e-usele
s
s-warnin
g
s
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge bra
n
ch
'tb/blame-resurrect-con
v
ert-to-git' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branc
h
'jc/plug
-
fmt
-
m
e
rge-msg-leak' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merge branch
'
pt/xdg-co
n
fig-path
'
into maint
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
S
ixth batch for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch 'sb
/
test-bitmap-fre
e
-
at-end'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge branch
'
mm/rebase-i-post-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C H
a
mano
M
erge bra
n
c
h
'fm/fetch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge branch 'sg/help-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
M
erge branch 'mm/l
o
g-format-r
a
w-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Mer
g
e branch 'dt/cat-file-follow
-
symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Ha
m
ano
M
erge branch 'r
s
/j
a
n
i
torial'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o
C
Hama
n
o
Merge
branch 'jk/stash-opt
i
o
n
s'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hama
n
o
Mer
g
e bra
n
ch 'da/merget
o
ol-
w
inmerge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge
b
ranch 'mc/commit-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C
H
ama
n
o
Me
r
ge b
r
a
n
ch
'
j
h
/
filter-
e
mpty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge bra
n
ch 'ah/usa
g
e-strings
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio
C
Hamano
Merge branch '
j
k/http-backend-deadloc
k
'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Me
r
ge
b
ranch 'dt/cle
a
n-
p
a
t
hspe
c
-filter-then-lstat
'
commit
|
commitdiff
|
tree
2015-05-27
Junio C Ha
m
ano
M
erge
b
ran
c
h 'nd/un
t
rack
e
d-
c
ache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7063:
hide stderr
fro
m
setup in
s
i
de prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o C Hamano
G
i
t
2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C H
a
mano
Merg
e
branch 'jk/sti
l
l-int
e
res
t
ing' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
J
unio
C Hamano
M
e
rge branch '
j
c/hash
-
object'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
J
unio C
H
a
m
a
n
o
Merge branch 'j
k
/rebase-quiet-
n
o
o
p' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Merge branch
'
sg/complet
e
-deco
r
a
te-full-not-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Haman
o
Mer
g
e b
r
anch 'jk/filter-branch-us
e
-
o
f-sed-on-in
c
omplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge branc
h
'
j
c/daemon-no-ipv6-for-2
.
4
.
1'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C H
a
mano
M
erge br
a
nch 'jk/stash
-
req
u
ir
e
-clean-index' into
maint
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Merge
b
r
a
nch 'jk/git-no-more-argv0-path
-
munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C Hamano
Fi
f
th b
a
tch for 2
.
5
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge b
r
anc
h
'nd/untra
c
ked-cache'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
H
amano
Merge bran
c
h 'rs/plug-lea
k
-in
-
pack-b
i
tmaps
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
mano
Merge b
r
an
c
h 'pt/p
u
ll-ff-vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C Hama
n
o
Merge branch 'pt
/
pull-l
o
g-n
'
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Ha
m
ano
Merge branch
'
j
k
/rerer
e
-for
g
et-che
c
k
-
enabled'
commit
|
commitdiff
|
tree
2015-05-26
Luke Diamand
gi
t
-
p4: tests: use test-
c
hmtime in place of touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C
Hamano
M
erge
b
ranch
'
j
k/
h
ttp-backend-deadloc
k
-2
.
3'
i
n
to jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
M
e
rge branch 'jk/h
t
tp-bac
k
e
nd-d
e
ad
l
ock-2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff K
i
ng
http-bac
k
end: sp
o
ol ref negot
i
ation req
u
ests
to
bu
f
fer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
stru
c
t ref_lock: co
n
v
e
rt
old_sha1 member to object
_
id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
warn
_
if_dangling_symr
e
f
(
): conv
e
rt local variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
e
a
c
h
_ref_fn
_
ada
p
t
e
r(): remov
e
a
d
a
pter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Ha
g
ger
t
y
rev_list_insert_
r
ef(): r
e
move unneeded
a
r
gume
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
rev_list_insert_
r
ef
_
oid()
:
new functi
o
n, taking an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
mark
_
co
m
plete(): remo
v
e
unneeded
arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
mark_compl
e
t
e
_oid():
new function,
taking an object_oi
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
clear_marks(): rewrite to take a
n
object_id argume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
mark
_
complete(
)
: rew
r
ite
to t
a
ke an
o
bject_id a
r
gument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Hagger
t
y
send_ref(
)
:
c
on
v
ert local variabl
e
"peeled" to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael
H
ag
g
e
r
t
y
upload
-
p
a
ck
:
re
w
rite fun
c
tions to take obj
e
ct_id argume
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
a
g
gerty
fin
d
_symr
e
f
(
):
c
o
nvert local variable "un
u
se
d
" to
object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
a
el
Ha
g
gerty
f
i
nd_symref(): re
w
rite to take an object_id argume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
write_one_ref
(
):
rewrite t
o
take an o
b
ject_id argumen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ae
l
Ha
g
gerty
w
rite_refs_to_temp_dir
(
): convert
l
ocal varia
b
le
sha1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
s
u
b
m
odule: rewri
t
e to
take an ob
j
ect_id
argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
cha
e
l
H
aggerty
shallow: rewrit
e
funct
i
ons to take object_id
arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next