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
t3418: test `rebase -r` with merge strategies
2019-07-31
Johannes S
c
hindelin
t3418: test `reba
s
e -r
`
with merge strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Johannes
Schindelin
t
/lib-rebase: pre
p
are for
t
esting `git rebas
e
--r
e
base
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Joh
a
n
n
es Schindel
i
n
reb
a
s
e -r:
s
u
pport merge strat
e
gi
e
s other
th
a
n `recursive`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Johannes Schindel
i
n
t3427:
f
i
x anoth
e
r incorre
c
t assumption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Johannes Schindelin
t3
4
27: accom
m
oda
t
e
f
o
r
the `r
e
b
a
se --merge` backe
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Jo
h
annes Sch
i
n
delin
t3427: fix erro
n
e
o
us assu
m
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Johan
n
es Schind
e
lin
t342
7
: co
n
dense the
unneces
s
a
r
ily repetitive test cases
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Joha
n
nes
S
chindelin
t34
2
7: move the `filter-bra
n
ch
`
i
nvocation i
n
to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
J
ohannes Schindel
i
n
t3427: simplify
the `setup` tes
t
c
ase
s
ignificantly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
J
oh
a
nnes Schind
e
li
n
t34
2
7: add a cla
r
ifying comme
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Jo
h
annes
S
c
h
indelin
rebase: fold git
-
rebase--common in
t
o
t
he -p
b
ackend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Johannes Schin
d
elin
s
e
q
u
enc
e
r: t
h
e `am` and `rebase--interac
t
i
ve` scripts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
J
ohanne
s
Schinde
l
i
n
.
g
iti
g
nore: the
r
e is n
o
longer a
b
uilt-in `git-re
b
ase
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Johannes Schindelin
t
3
400
:
stop referr
i
ng
to t
h
e
s
cripted
r
ebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Johanne
s
Schindelin
Drop unu
s
ed git
-
reb
a
se--am
.
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-25
Johannes Schindelin
git: mark cmd_
r
ebase as requiri
n
g a worktree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-25
Johan
n
es
S
chindelin
re
b
ase: fix white-s
p
ace
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-06-07
Junio C Hamano
Git 2
.
22
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-06-07
J
u
nio C Hamano
Mer
g
e tag 'l10n-2
.
22
.
0-rnd3'
of git://g
i
thu
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2019-06-06
Junio C Ha
m
a
n
o
Merge branch
'en/mer
g
e
-
directory-re
n
ames
-
fix'
commit
|
commitdiff
|
tree
2019-06-05
Eli
j
ah Newr
e
n
merge-rec
u
rsive: re
s
tore ac
c
i
d
entall
y
d
roppe
d
setting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-06-03
J
un
i
o C H
a
mano
Git
2
.
22-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-06-03
Junio
C Hamano
M
e
rge branch 'cc/
l
ist-objects-filter-wo-s
p
arse-path'
commit
|
commitdiff
|
tree
2019-06-03
Jian
g
Xin
i18n
:
fix typos f
o
und during l10n fo
r
git 2
.
22
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-06-03
Todd
Z
ullinger
RelNotes: minor typo fixes i
n
2
.
2
2
.
0 draft
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-30
Junio C Hamano
Git 2
.
2
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-30
Junio C H
a
m
a
no
Merge branch 'js/r
e
b
ase-config-bit
f
i
x
'
commit
|
commitdiff
|
tree
2019-05-30
Junio
C Hamano
Merge branch 'es/doc-gitsubmodule
s
-
ma
r
kup'
commit
|
commitdiff
|
tree
2019-05-30
Junio C Hamano
Merge branch 'ja/diff-opt-
t
ypofix'
commit
|
commitdiff
|
tree
2019-05-30
Junio C Ha
m
ano
M
erge b
r
a
n
ch 'jt
/
clone-
s
erver-opt
i
on'
commit
|
commitdiff
|
tree
2019-05-30
J
u
nio C H
a
mano
Merg
e
branch 's
g
/progr
e
ss-
o
ff-
b
y-
o
ne-fix
'
commit
|
commitdiff
|
tree
2019-05-30
Junio C Hamano
Merg
e
b
ranch 'js/r
e
base-depre
c
a
te-preserve-merges'
commit
|
commitdiff
|
tree
2019-05-30
Junio
C Hamano
Merge bra
n
ch 'sg/trac
e
2-rename'
commit
|
commitdiff
|
tree
2019-05-30
Junio C Hama
n
o
M
e
rge branch
'
jh/tr
a
ce2'
commit
|
commitdiff
|
tree
2019-05-30
Junio C H
a
man
o
M
e
rge
b
ranch 'nd/diff
-
parse
o
p
t'
commit
|
commitdiff
|
tree
2019-05-29
C
hr
i
s
tian C
o
uder
list-objects-fil
t
e
r
:
d
i
sable
'
sparse:path' f
i
lters
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-29
Nguyễn Thá
i
Ngọc Du
y
parse-options:
c
heck empt
y
value in OPT_INTEGER
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-29
Nguyễn Thái Ngọc Duy
d
i
ff-
p
arseopt
:
restore -U
(
no argument) b
e
havior
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-29
Nguyễn Thái
N
g
ọc Duy
diff-pa
r
s
eopt: correct va
r
iab
l
e types that are used
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-28
J
o
h
a
nnes Schindelin
rebase docs:
r
ecomme
n
d `-r` over `-p`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-28
Johannes Schind
e
l
in
docs: say that `--r
e
b
a
s
e
=prese
r
ve`
i
s
deprecated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-28
Johann
e
s
S
chindelin
tests: mark a coupl
e
mo
r
e test
cases as re
q
uiri
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-28
J
o
nathan Tan
fetch-pack: send
s
erver o
p
tions after co
m
mand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-28
Jeff
H
o
stet
l
er
trace2: fix t
r
acing w
h
en
N
O
_
PTHRE
A
DS
i
s d
e
f
in
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-28
J
o
hannes Schindelin
rebase
:
replace inc
o
rr
e
c
t
log
i
cal negat
i
o
n by correc
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-28
SZEDER Gábor
progress:
avo
i
d empty
line when break
i
ng t
h
e progress
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-28
SZEDER Gábor
trace2: doc
u
me
n
t the
su
p
porte
d
value
s
o
f GIT_TR
A
CE
2
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-28
S
ZE
D
ER
Gábor
trace2: renam
e
environme
n
t variables t
o
GIT
_
TRACE2*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-28
Emily S
h
affer
gitsubmodul
e
s: a
l
ign html an
d
nroff lists
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-19
Junio C
H
amano
Git
2
.
22-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
M
e
rge
b
r
anch
'js/diffto
o
l-no-inde
x
'
commit
|
commitdiff
|
tree
2019-05-19
J
u
n
io C Ha
m
ano
Merge
b
ranch 'jk/get-oi
d
-indexed-object-name'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
Merge branch '
j
c
/
s
et
-
pac
k
et-he
a
der-signature
-
fix'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
M
erge b
r
anch 'cb/http-push-null-in-message-fix'
commit
|
commitdiff
|
tree
2019-05-19
Junio
C Ham
a
no
Merge br
a
nch 'js/stash-in-c-use-builtin-doc'
commit
|
commitdiff
|
tree
2019-05-19
J
u
n
io C Hamano
Merge b
r
anch 'tz/tes
t
-lib-check-worki
n
g-jgit'
commit
|
commitdiff
|
tree
2019-05-19
Junio C H
a
ma
n
o
Merge br
a
nch 'j
s
/parseopt-unk
n
o
wn-cb-
r
eturns-a
n
-enum'
commit
|
commitdiff
|
tree
2019-05-19
J
u
nio
C Ham
a
no
M
e
rge branch 'ab/sha1dc'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Ha
m
ano
Merge branch 'js/rebase-i-lab
e
l-shown-in
-
status
-
fix
'
commit
|
commitdiff
|
tree
2019-05-19
J
u
nio C Hamano
Me
r
ge branc
h
'es
/
check-non-port
a
ble-pr
e
-5
.
10'
commit
|
commitdiff
|
tree
2019-05-19
Jun
i
o C Hamano
Mer
g
e branch
'ds/trace2-d
o
cument-env-
v
ars
'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
Mer
g
e bran
c
h 'js/fsmonitor-refre
s
h-a
f
ter-discardi
n
g
.
.
.
commit
|
commitdiff
|
tree
2019-05-19
Ju
n
io C Ham
a
no
M
e
rge branch
'cm/notes-c
o
mme
n
t-fix'
commit
|
commitdiff
|
tree
2019-05-19
J
u
nio C Hamano
M
e
r
ge branch 'tt/no-ipv6-fallback
-
for-winxp
'
commit
|
commitdiff
|
tree
2019-05-19
Jun
i
o C Hamano
Merge branch 'js/t5580-un
c
-al
t
er
n
ate-tes
t
'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
Me
r
ge b
r
anch 'ds/cvsexport
c
ommit-forc
e
-t
e
x
t
'
commit
|
commitdiff
|
tree
2019-05-19
J
u
nio C Hamano
Mer
g
e branch '
s
g/
c
i
-
libsvn
-
p
e
rl'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
M
er
g
e b
r
anc
h
'
bl/t4253-exit-code-from-
f
orm
a
t-patch'
commit
|
commitdiff
|
tree
2019-05-19
Juni
o
C H
a
mano
Merge branch '
d
s/midx-too
-
many-packs'
commit
|
commitdiff
|
tree
2019-05-19
Jun
i
o C Hamano
M
erge branch 'en/unicode
-
in-refnames'
commit
|
commitdiff
|
tree
2019-05-19
Ju
n
io C Ham
a
no
Merge branch '
d
l/dif
f
to
o
l-merge
t
ool'
commit
|
commitdiff
|
tree
2019-05-19
J
u
nio C Ham
a
no
M
erge bran
c
h 'mh/ht
t
p-fread-api-fix'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hama
n
o
Merge br
a
nch 'js/t6500-use-
w
i
n
dows-pid
-
on-mingw'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
Me
r
ge
branch 'jk/
a
pache-lsan'
commit
|
commitdiff
|
tree
2019-05-19
Junio C
H
a
m
ano
Merge
b
ranch 'nd/parse-op
t
ions-aliases'
commit
|
commitdiff
|
tree
2019-05-19
Junio C
H
ama
n
o
Merge br
a
nch '
d
l/bran
c
h-from-3do
t
-
m
e
rge-base'
commit
|
commitdiff
|
tree
2019-05-19
J
u
nio
C Hamano
Merge branc
h
'js/com
m
it-g
r
aph-parse-leakfix'
commit
|
commitdiff
|
tree
2019-05-19
Junio
C
Hamano
Merge branc
h
'jk/cocci-batch
'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
Merge branch 'ab
/
perf-in
s
talled
-
fix'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
Merge
b
r
anch 'id/windows-dep
-
aslr'
commit
|
commitdiff
|
tree
2019-05-19
Junio C
H
amano
Merge branch 'ab/
t
r
a
ce2-ty
p
ofix'
commit
|
commitdiff
|
tree
2019-05-19
Ju
n
io C Hamano
M
e
rge
b
ranch 'nd
/
submodule-h
e
lper-incomplete-line-fix'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
M
e
rge branch 'cw/diff-highlig
h
t
'
commit
|
commitdiff
|
tree
2019-05-19
Junio C Hamano
Merge
b
r
a
nc
h
'dl/
w
arn-tagging-a-t
a
g
'
commit
|
commitdiff
|
tree
2019-05-19
Jean-Noël Avila
diff: fix mistake i
n
t
r
anslatable
s
trings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-16
Junio C Ham
a
n
o
pkt-line: drop 'con
s
t'-
n
ess of a pa
r
am to set_packet_head
e
r()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-15
T
o
d
d Zullinger
test-l
i
b: try harder to ensure a
workin
g
jgit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-15
J
e
ff King
get_oid: handle NULL repo->index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-15
Carlo Marcelo Arenas
.
.
.
http-push: prevent format overflow warning
with gcc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-15
Johannes Schindelin
stash: document stash
.
useBuiltin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-14
Ævar Arnfjörð
B
j
arm
a
son
sha1dc: update from upstream
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-14
Johannes Schindel
i
n
p
arse-options: adjust `
p
a
r
s
e_op
t
_unknown_cb()`s dec
l
ared
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-13
Junio C Hamano
Git
2
.
2
2-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-05-13
J
u
nio C Ha
m
ano
Merge bran
c
h
'jh/tr
a
ce2'
commit
|
commitdiff
|
tree
2019-05-13
J
u
n
io C
H
amano
Me
r
g
e b
r
anc
h
'cc/
a
cc
e
ss-
o
n-aix-workar
o
und'
commit
|
commitdiff
|
tree
2019-05-13
Jun
i
o
C H
a
ma
n
o
M
e
r
ge branch 'p
w
/clea
n
-seq
u
encer-state-upon-
f
inal-commit'
commit
|
commitdiff
|
tree
2019-05-13
Junio C Hamano
Merge
branch
'
pw/rebase-i-
i
nternal'
commit
|
commitdiff
|
tree
2019-05-13
Jun
i
o C Hamano
Me
r
ge branch 'jk/p
e
rf
-
ag
g
r
egate-wo-lib
j
son'
commit
|
commitdiff
|
tree
2019-05-13
Junio C Hamano
M
e
r
ge
branch '
d
l/rev-tild
e
-
d
oc-clarif
y
'
commit
|
commitdiff
|
tree
2019-05-13
Junio C
H
amano
Merge branch '
j
c/make-dedu
p
-ls-fil
e
s-output
'
commit
|
commitdiff
|
tree
next