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
notes: extract parse_notes_merge_strategy to notes-utils
2015-08-17
J
acob Keller
notes: extract pa
r
se_n
o
tes_merge_strategy to notes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-17
Jac
o
b
Keller
notes: extract enum notes_mer
g
e_st
r
ategy to notes-utils
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-17
Jacob Kell
e
r
notes: docume
n
t cat_sort_
u
niq rewr
i
teMode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
a
n
o
Git 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Haman
o
Sy
n
c
with 2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
io C
H
amano
Git 2
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C H
a
mano
Merge branch '
j
k/
p
ret
t
y-e
n
codin
g
-doc' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hamano
M
erge branch 'tb/checkout
-
doc' into
m
ain
t
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
io C Hamano
Mer
g
e
b
ranch 'ls/hint-rev-
l
ist-c
o
unt' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hama
n
o
Merge branch 'mm/branch-doc-update
s
' in
t
o maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
H
a
m
ano
Me
r
ge b
r
anch 'jc/fsck-r
e
tire
-
requ
i
re-
e
oh' int
o
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
M
e
rge
b
ranch 'et/ht
t
p-proxyauth' in
t
o maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
M
e
rge branch 'jc/unexport-git
-
pag
e
r-i
n
-use-in-page
r
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
Merge branch
'
mh
/
strbuf-
r
ead-file-returns-ssi
z
e-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
Merge branch 'kb/co
n
fig-unm
a
p-bef
o
re-renami
n
g'
into
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
i
o
C
Hamano
Merge branch 'jk/
r
e
v
-li
s
t-no-bitmap-while-pruning
'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Merge branch 'rh/te
s
t-color-av
o
id-terminfo-in-origin
a
l
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Haman
o
Merge branch 'jk/fix-ref
r
esh-utime' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Ha
m
ano
M
erge bran
c
h '
c
b/reb
a
se-am-exit-code' into
m
ain
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
Merg
e
branch 'j
k
/
i
nd
e
x
-
pa
c
k-reduce-recheck' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o
C Hamano
RelNote
s
: am
.
th
r
eeWa
y
does not e
x
i
st (yet)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C Hamano
Re
v
ert "git
-
am: add a
m
.
threeWay config
vari
a
ble
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
J
unio C Hamano
Git 2
.
5
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
Jun
i
o C
H
amano
Merge branch 'tf/git
w
eb-ty
p
ofix'
commit
|
commitdiff
|
tree
2015-07-21
Junio C H
a
mano
Merge tag 'l10n-2
.
5
.
0-rnd2' of git
:
/
/github
.
c
om/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-17
Junio C Hamano
Mer
g
e branch 'jk
/
still-i
n
ter
e
s
ting'
commit
|
commitdiff
|
tree
2015-07-17
Ju
n
io C Hamano
Me
r
ge branch
'
e
s/workt
r
ee-add'
commit
|
commitdiff
|
tree
2015-07-17
Eric Sunshine
Documentation
/
gi
t
: fix stale "MU
L
TI
P
LE CHECKOUT M
O
DE
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-16
Jun
i
o C Hamano
work
t
r
e
e:
c
aution
t
h
at this is sti
l
l
experimen
t
al
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-16
Eri
c
Su
n
shine
Documentation/git-
w
orktree:
f
ix stale "
g
it chec
k
out
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
H
aman
o
Sync wi
t
h
2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Jun
i
o
C Hamano
Git
2
.
4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-15
J
unio C Hamano
Merge
b
ranch 'jc/d
i
ff-ws-e
r
ror-highli
g
ht'
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
Hamano
Merge bra
n
c
h
'
m
m/describe-do
c
' into maint
commit
|
commitdiff
|
tree
2015-07-15
J
unio
C Hamano
Me
r
ge branch
'jc/pr
o
m
pt-document-
p
s1-
s
tate-separator
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
Hamano
Merge b
r
a
n
ch
'es/o
s
x-header-pollutes
-
mask-macro' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merg
e
branch 'e
s
/utf8-stupid-compiler-workaround'
into
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
J
unio C Hamano
Me
r
g
e
b
r
anch 'fk/doc-format-patch
-
vn' i
n
t
o main
t
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge bra
n
ch 'pt/t030
2
-needs-sanity' into maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge
b
ranch
'
me/fetch-
i
n
t
o
-sha
l
low-saf
e
ty' in
t
o maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merg
e
branch 'mh/fsck-reflog-
e
ntries' into maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge
b
ranch 'a
f
/tcsh
-
complet
i
o
n
-noclobbe
r
' into maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
M
erge b
r
a
n
ch 'pa/au
t
o-
g
c-mac-osx' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C Hamano
Merge b
r
an
c
h 'jc/do-not-
f
e
ed-tags-to-cle
a
r
-commit-ma
r
ks
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio
C
H
a
m
ano
Merg
e
tag 'l10n
-
2
.
5
.
0-r
n
d1
'
of gi
t
://git
h
ub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hama
n
o
G
i
t 2
.
5
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hama
n
o
Merge branc
h
'
es/worktree-add'
commit
|
commitdiff
|
tree
2015-07-13
J
u
nio C Hamano
Merge branch 'nd/mul
t
ipl
e
-work-trees'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Me
r
ge
branch 'ss/clone-
g
uess-dir-
n
am
e
-simplify'
commit
|
commitdiff
|
tree
2015-07-13
Ju
n
io
C
Ha
m
ano
Merge branch 'kb/
c
o
n
fi
g
-unmap-befo
r
e-ren
a
ming'
commit
|
commitdiff
|
tree
2015-07-13
J
unio
C
Hamano
Merge
b
ranch 'mh/strbuf-
r
ead-fil
e
-r
e
t
u
r
ns-ssize-t'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
M
erg
e
branch 'j
c
/unexport-git-pager-
i
n-use-
i
n-pager'
commit
|
commitdiff
|
tree
2015-07-13
Junio C H
a
ma
n
o
Merge branch '
k
b/u
s
e
-nsec-doc'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merge bra
n
ch 'js/rebase-i
-
clean-up
-
u
p
o
n-c
o
ntinue-to
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio C Haman
o
Merg
e
b
r
anch 'et/ht
t
p-proxy
a
u
th
'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merge branch 'jc/fsck-
r
eti
r
e-require-e
o
h'
commit
|
commitdiff
|
tree
2015-07-12
René Scharfe
d
i
ff: parse
w
s-err
o
r-highlight opt
i
on more strictly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-12
Junio C
H
amano
Revert "c
h
ecko
u
t
: ret
i
re --ig
n
ore-o
t
her-worktrees in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-10
J
u
nio C Ha
m
ano
The last
m
inute bits
o
f
fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-10
J
u
nio
C
Hamano
Merge bra
n
ch 'cb/reb
a
se-am-
e
xit
-
code'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hama
n
o
Merge branch 'j
k
/
f
ix-
r
efre
s
h-ut
i
me'
commit
|
commitdiff
|
tree
2015-07-10
J
u
nio C Hamano
Merge
b
ra
n
ch
'
m
m/bran
c
h-doc-updat
e
s'
commit
|
commitdiff
|
tree
2015-07-10
J
u
nio C
H
amano
Merge
b
r
a
nch 'l
s
/hint-r
e
v-list-count'
commit
|
commitdiff
|
tree
2015-07-10
J
u
nio C
H
aman
o
Merge branch '
j
k/rev-list-no-bitmap-while-pruning'
commit
|
commitdiff
|
tree
2015-07-10
J
unio
C Hamano
M
e
rge branch 'cb
/
subtre
e
-
tests-upda
t
e'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hama
n
o
M
er
g
e
branch 'rh/test-c
o
lor-avoid-
t
erminfo-in-original
.
.
.
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hamano
Merg
e
branch 'sb/p53
1
0-and-
c
hain'
commit
|
commitdiff
|
tree
2015-07-10
Ju
n
io C Hamano
Merge br
a
nch 'tb/c
h
e
c
k
ou
t
-doc'
commit
|
commitdiff
|
tree
2015-07-10
Jun
i
o C Hamano
Merge branch 'jk/pretty-
e
ncoding-doc'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Ha
m
ano
M
e
rge branch 'nd/dwim-wildca
r
ds-as-pa
t
h
s
pecs'
commit
|
commitdiff
|
tree
2015-07-09
Junio C Ha
m
ano
M
erge bran
c
h 'j
k
/maint-fo
r
-ea
c
h
-packed-obj
e
ct
'
commit
|
commitdiff
|
tree
2015-07-09
Junio C
H
amano
Merge branch 'jc/fix-alloc
-
sortbuf-i
n
-i
n
d
e
x
-pa
c
k'
commit
|
commitdiff
|
tree
2015-07-09
S
e
bastian
S
chu
b
erth
cl
o
ne
:
sim
p
lify string handling in gue
s
s_dir_nam
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-08
Jeff
K
ing
che
c
k_and_freshen
_
file: fix revers
e
d succ
e
ss
-
check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-08
Clemen
s
Buc
h
acher
rebase: r
e
t
u
r
n non-z
e
r
o
err
o
r cod
e
if format
-
patc
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-07
Eric
Sunshine
checko
u
t: ret
i
re --ignore-o
t
her-worktrees in favor
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-07
Eric
S
unshine
worktree: add: auto-vivify new bra
n
ch
when <branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Suns
h
ine
worktree: ad
d
: ma
k
e -b/-B default t
o
HEAD when <
b
ranch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
work
t
r
e
e:
e
xtract basename compu
t
ation
t
o new function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Er
i
c S
u
nshine
checkout: require worktree uncondit
i
o
n
ally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric S
u
nshine
c
heckout:
ret
i
r
e
-
-
t
o op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric
S
u
n
s
hine
test
s
: worktree: retrofit "checkout --to"
t
ests for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Suns
h
ine
worktree: add -b/-B options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
wor
k
tree:
a
dd --detach
o
p
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
w
o
rktr
e
e:
add --
f
orce optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
E
ric Su
n
shine
worktree: introduce "add" command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
E
r
ic
S
unsh
i
ne
checkout: drop '
c
hec
k
o
u
t_opts' dependency from prepa
r
e_linke
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric
Sunshine
c
h
eckout: make --to uncon
d
itionally verbos
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
checkout:
prep
a
re_linked_check
o
ut: drop no
w
-unused
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
ch
e
c
k
out: relocate --to'
s
"no branch specified" check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
E
ric Sunshine
chec
k
o
ut: fix bug
with --to and
r
elative HEAD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric
Su
n
shin
e
Documentation/git-worktree: add EXAMPL
E
S s
e
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
Documentation/git-worktree: add high-le
v
e
l
'lock' o
v
er
v
iew
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
E
r
ic Sunshine
Documentation/git-workt
r
ee: s
p
lit tec
h
ni
c
al info fro
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Er
i
c
Sunshine
Docum
e
ntation/git-w
o
rktree: add BUGS
s
ection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric S
u
nshine
D
ocume
n
tation:
m
o
ve linked worktree d
e
s
cription
fro
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Er
i
c Suns
h
ine
D
ocumentation/git-wo
r
ktre
e
: as
s
oc
i
a
t
e
o
p
tions with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Er
i
c Sunshine
Documentation/gi
t
-checkout
:
f
i
x incorrect worktree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Matthieu Moy
Do
c
umentation/branc
h
:
d
o
cum
e
nt -M and -D in terms of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Matthieu Moy
D
o
cument
a
tion/branch: docum
e
nt -
d
--fo
r
ce and -m -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next