repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'se/doc-checkout-ours-theirs' into maint
2015-08-19
Junio C Hamano
M
erge br
a
nch '
s
e/d
o
c-ch
e
ckou
t
-
ou
r
s
-theirs' i
n
to
m
aint
commit
|
commitdiff
|
tree
2015-08-19
J
u
nio
C
H
amano
Merge branch 'cb/uname-in
-
untrack
e
d'
into main
t
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hama
n
o
M
erge b
r
anch 'as/sp
a
rse-che
c
kout-remo
v
a
l
' into ma
i
nt
commit
|
commitdiff
|
tree
2015-08-19
Junio C
H
am
a
no
M
erge b
r
a
n
ch 'db/send-pack-user-signing
k
e
y' i
n
to
m
aint
commit
|
commitdiff
|
tree
2015-08-19
J
unio C Ha
m
a
n
o
Merge branch
'
jx/
d
o-not
-
c
rash-receive-
p
ack-wo-
h
ead
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
J
u
n
io C H
a
mano
Merge branch 'da/subtree-dat
e
-confus
i
on' int
o
maint
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C H
a
man
o
Syn
c
wit
h
2
.
4
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Hamano
Git 2
.
4
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch
'
js
/
rebase-i
-
clean-up
-
upon-continue-to
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
e
r
ge b
r
anch 'ss/clone-guess-dir-n
a
me-simplify' into
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
J
u
ni
o
C Hamano
Mer
g
e branc
h
'sg
/
completion-commi
t
-
c
l
e
anu
p
' into m
a
in
t
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
ge branch 'pt/
a
m-abo
r
t-f
i
x' into
m
aint
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
amano
M
e
rge branch 'mh/reporting-broken-refs-
f
rom-for
-
e
a
c
h
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Ha
m
ano
M
erge branch
'
s
g/commit-cleanup-sciss
o
rs' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
uni
o
C Hamano
Git 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hama
n
o
Sync with
2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Git 2
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
M
e
rge
b
ranc
h
'
j
k/pretty-encoding-doc' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
ano
M
erge bran
c
h 'tb/checkout-doc' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
M
e
r
ge branch 'ls
/
hint
-
rev-list-count' i
n
to maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C Hamano
M
erge bra
n
ch 'm
m
/br
a
n
c
h-doc-updates' into
maint
commit
|
commitdiff
|
tree
2015-07-27
J
unio
C
H
amano
Mer
g
e branch 'jc/fsck-
r
etire-requir
e
-eoh' into mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge b
r
anch 'e
t
/http-proxyauth
'
into maint
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C H
a
mano
Merge bra
n
ch
'jc/unexport-git-pag
e
r-in
-
use-in-pager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C Hamano
Merge branch 'm
h
/strbuf-
r
ead-file-ret
u
rns-ssiz
e
-
t
'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Hamano
Me
r
ge
b
ranch 'kb/conf
i
g-unmap-before-renami
n
g' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
i
o C Hamano
Mer
g
e
branch '
j
k/rev-l
i
s
t-no-bitmap-whi
l
e-pr
u
ning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
Merge branch 'rh/test-c
o
lor-avoid-te
r
min
f
o-in-
o
riginal
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
Merge bra
n
ch '
j
k/fix-refr
e
sh-utime'
into maint
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C H
a
mano
Merge bra
n
ch 'cb/rebase
-
a
m-exi
t
-code' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C H
a
mano
Merge branch 'jk/index
-
pack-re
d
uc
e
-recheck
'
into maint
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
RelNot
e
s: am
.
thr
e
eWay
does n
o
t exist (y
e
t
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
Re
v
ert "git-am: add am
.
threeWa
y
config variab
l
e"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-23
Dav
i
d Aguilar
contrib/
s
ubtree: ignore lo
g
.
date confi
g
ura
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-22
Jiang
Xin
receive
-
pack: cras
h
when chec
k
in
g
with non-exist HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Juni
o
C Hama
n
o
built
i
n
/send-pack
.
c
:
respect user
.
sign
i
n
g
key
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
J
unio C
H
a
m
ano
Git 2
.
5
.
0-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Davi
d
T
urner
u
npack-
t
rees: don'
t
update files with CE_WT_REMOV
E
set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C H
a
man
o
Merge b
r
anch 'tf/git
w
eb-typofix'
commit
|
commitdiff
|
tree
2015-07-21
Jun
i
o C Hama
n
o
Merg
e
tag 'l10n-2
.
5
.
0-rnd2
'
of
g
it://github
.
c
o
m/
g
it
.
.
.
commit
|
commitdiff
|
tree
2015-07-17
Charles Bailey
un
t
racke
d
: f
i
x detection of uname(2) fa
i
lu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Ju
n
io C Hamano
Merg
e
b
r
anch 'jk/sti
l
l-interesting'
commit
|
commitdiff
|
tree
2015-07-17
Junio C H
a
m
a
no
Merge bra
n
ch 'e
s
/w
o
rktree-add'
commit
|
commitdiff
|
tree
2015-07-17
E
r
ic Sun
s
hine
Doc
u
mentation/gi
t
: fi
x
stale "MULTIPLE C
H
E
C
KOUT MODE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Jun
i
o C Hamano
worktree:
c
au
t
ion that this is still experimenta
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Eric Sunshine
Documentatio
n
/git-worktre
e
:
fix stal
e
"git checkout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Junio C H
a
mano
Syn
c
with 2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Git 2
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
J
u
ni
o
C
Hamano
M
e
rge bra
n
ch 'j
c
/diff-ws
-
e
rror-highli
g
ht'
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C Hamano
Merge branch '
m
m/describe-doc' into maint
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
H
amano
Merge branch 'jc
/
p
r
o
m
pt-d
o
cument-ps1-sta
t
e-separator
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
i
o
C Hamano
Merge bra
n
ch 'es/osx-
h
eader-pollut
e
s-mask-macro' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Junio C Haman
o
M
e
rg
e
branc
h
'es/utf8-
s
tupid
-
compiler-w
o
rka
r
ound' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C Hamano
Me
r
ge branch 'fk/doc-f
o
rmat-patc
h
-vn' int
o
main
t
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge branch 'pt/t0302-needs-sa
n
ity'
i
nto
maint
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
i
o
C
Ha
m
ano
Merge branch 'me/fetc
h
-int
o
-shallow-s
a
fety' into maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C H
a
mano
M
e
rge branch 'mh/fsck-reflog-entries' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-15
J
unio C Hamano
Merge branch 'af/tcsh-completion-noc
l
obber
'
i
n
t
o
main
t
commit
|
commitdiff
|
tree
2015-07-15
Juni
o
C Hamano
Me
r
ge bra
n
ch
'pa
/
auto-gc-ma
c
-
o
sx' in
t
o maint
commit
|
commitdiff
|
tree
2015-07-15
Junio
C Hamano
Merge
b
ranch 'jc/
d
o-n
o
t-feed-ta
g
s-to-clear-commit-mark
s
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio C Haman
o
Merge tag 'l10n-2
.
5
.
0-rnd1' of git://git
h
ub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Juni
o
C Hamano
Git 2
.
5
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-13
Jun
i
o C Hamano
Merg
e
b
ranch '
e
s/wor
k
tree-
a
dd'
commit
|
commitdiff
|
tree
2015-07-13
J
unio C
Hamano
Merge bra
n
ch 'nd/multiple
-
w
o
r
k
-trees'
commit
|
commitdiff
|
tree
2015-07-13
Junio
C
H
a
mano
M
e
rge branc
h
's
s
/clone-gue
s
s-dir-name-simplify'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hama
n
o
Mer
g
e
branch 'kb/config-u
n
m
a
p-b
e
for
e
-renaming'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merge branch 'm
h
/strbuf-read
-
file-retu
r
ns-ssize-t'
commit
|
commitdiff
|
tree
2015-07-13
J
unio C Hama
n
o
M
erge branch 'j
c
/u
n
e
xport-git-pager
-
in-use-
i
n-p
a
ger'
commit
|
commitdiff
|
tree
2015-07-13
J
u
ni
o
C Hamano
Merge
branch 'kb/u
s
e-nsec-doc'
commit
|
commitdiff
|
tree
2015-07-13
Juni
o
C Hamano
Merge branch 'j
s
/rebase-i-clean-up-upon-cont
i
nue-
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio C H
a
man
o
M
erge branch
'et/http-pr
o
xyauth'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merge
b
ra
n
ch 'jc/
f
sc
k
-retire-require-eoh
'
commit
|
commitdiff
|
tree
2015-07-12
Ren
é
Sch
a
rf
e
diff: pa
r
se ws-error-h
i
ghlight option more s
t
rictl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-12
Juni
o
C Ha
m
ano
Rev
e
rt "chec
k
out: retire --i
g
nore-other-worktrees in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-12
Simon
A
.
Eug
s
t
e
r
checkout: doc
u
ment sub
t
l
e
ty around --ou
r
s
/--theirs
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hamano
T
h
e
las
t
minute bits of fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-10
Juni
o
C Hamano
Mer
g
e b
r
anch 'cb
/
re
b
ase-am-ex
i
t-code'
commit
|
commitdiff
|
tree
2015-07-10
Junio C
Hamano
Merge b
r
anch
'
jk/fix-refresh
-
ut
i
me'
commit
|
commitdiff
|
tree
2015-07-10
J
unio
C Hamano
Merge b
r
anch 'mm/branch
-
d
o
c
-
updates'
commit
|
commitdiff
|
tree
2015-07-10
Junio
C
Hamano
Merge branc
h
'ls/hint
-
r
e
v-list-cou
n
t'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hamano
Mer
g
e branch
'
jk/r
e
v-l
i
st
-
n
o-bit
m
a
p
-whil
e
-pruning
'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hama
n
o
Merge branch
'
cb/su
b
tree-tests-upda
t
e'
commit
|
commitdiff
|
tree
2015-07-10
J
unio C Hamano
Merge branch 'rh/t
e
st
-
color-a
v
oid-ter
m
i
n
fo
-
in-origin
a
l
.
.
.
commit
|
commitdiff
|
tree
2015-07-10
Juni
o
C
Ha
m
ano
Merge
branch
'
sb/p5
3
10-and-cha
i
n
'
commit
|
commitdiff
|
tree
2015-07-10
Juni
o
C
Hamano
Merge branch 'tb/c
h
eckout-do
c
'
commit
|
commitdiff
|
tree
2015-07-10
Juni
o
C
H
a
m
a
no
Merge br
a
nch 'j
k
/pretty-encod
i
ng-d
o
c'
commit
|
commitdiff
|
tree
2015-07-10
Jun
i
o
C Hamano
Merge bra
n
ch 'nd/dwim
-
wildcards-as-pat
h
s
p
ec
s
'
commit
|
commitdiff
|
tree
2015-07-09
J
un
i
o C H
a
mano
Merge bra
n
ch 'jk/mai
n
t-for-e
a
ch-packed-
o
b
j
e
ct'
commit
|
commitdiff
|
tree
2015-07-09
Junio C
Hamano
M
e
r
ge b
r
a
n
ch 'jc/fix-all
o
c-sortbuf-in-inde
x
-pa
c
k'
commit
|
commitdiff
|
tree
2015-07-09
Sebasti
a
n S
c
huberth
clon
e
: simplify string
handling in
gue
s
s_di
r
_name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-08
Jeff King
c
he
c
k_and_
f
resh
e
n
_
file:
fix reverse
d
success-check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-08
C
l
eme
n
s Buchacher
rebase: return non-zero erro
r
code
if f
o
rmat-patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-07
Eric S
u
nshine
check
o
u
t: retire --
i
gnor
e
-other-worktrees in fav
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-07
Eric
Sunshin
e
work
t
ree: ad
d
: a
u
to-
v
ivify new branch when <br
a
n
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
r
ic Sunshine
worktree
:
a
dd
:
make -b/-B
default
t
o HEA
D
whe
n
<
branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric
Sunshine
work
t
r
e
e: extract basename co
m
putation t
o
new funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
che
c
kout: require w
o
r
k
tree u
n
c
onditionall
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
ric
Sun
s
hine
ch
e
ckou
t
: retire --to op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
tests: worktree: ret
r
o
f
i
t
"checkout --to" tests for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
ri
c
Sunshine
worktree: a
d
d -b/-B options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next