repo.or.cz
/
git
/
mjg.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
Juni
o
C Hamano
Merg
e
b
ran
c
h 'se
/
doc-checkout-ou
r
s
-
theirs' into maint
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge branch 'cb/unam
e
-in-untracked' into main
t
commit
|
commitdiff
|
tree
2015-08-19
Junio
C
Hamano
Merge branch 'as/spars
e
-
che
c
kout-re
m
o
val'
into
maint
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
M
e
rge
branch
'
db/send-pack-user-signin
g
k
ey' into
m
aint
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge branch 'jx/do-not
-
crash-receive
-
pack-wo-hea
d
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Junio
C
H
a
m
a
n
o
M
e
rg
e
b
ranch 'da/subt
r
ee-date-confusion'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
n
o
Sync with 2
.
4
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
Git 2
.
4
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
i
o
C Hamano
Merge branch '
j
s/rebase-i-clean-
u
p-u
p
o
n
-
c
ontinue-to
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
a
mano
M
e
r
g
e branch 'ss/clone-guess-dir-name-simpli
f
y
' into
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merg
e
bra
n
ch '
s
g
/comple
t
ion-
c
ommit-cleanu
p
'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merge bra
n
ch 'pt/a
m
-
a
bort-fix' into maint
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge
b
ranch
'
mh/reportin
g
-b
r
oken-r
e
fs
-
f
r
om-for-each
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Ham
a
no
Merge b
r
anch 'sg/commit-
c
leanup-s
c
iss
o
rs' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
G
i
t 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Sync with 2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
am
a
n
o
Git 2
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Ham
a
n
o
Merge branch 'jk/pretty-encoding-doc'
i
nto maint
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
Mer
g
e bran
c
h 'tb/che
c
kout-
d
oc' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
Merge branc
h
'ls
/
hint-rev-list-count'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
Me
r
g
e
bra
n
ch
'
mm/branch-doc-u
p
dates' in
t
o maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Ha
m
ano
Me
r
ge
b
ranch '
j
c/fsc
k
-reti
r
e-requi
r
e-eoh
'
into maint
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C Hamano
Merge branch 'et/htt
p
-
p
roxy
a
uth'
int
o
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch 'jc/unexp
o
r
t
-
git
-
pager-in-use-in-
p
ager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
Merge branch 'm
h
/strbuf-read-f
i
le-returns-ssize-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hama
n
o
M
erge branch 'kb/config-unmap-before-renami
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
M
erge br
a
n
c
h 'jk
/
rev-list-no-bit
m
a
p-
w
hile-pruning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branc
h
'rh/
t
e
s
t-color-avoid-term
i
nfo-in-origin
a
l
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge
b
ran
c
h 'jk/f
i
x-refresh-ut
i
me' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge
b
ranc
h
'cb/
r
ebase-am-exit-code' into
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
M
erge
branc
h
'jk/in
d
ex-pack-reduce-recheck' into maint
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
RelNotes
:
am
.
thr
e
eWay do
e
s n
o
t exist (yet)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
Revert "git-am: add am
.
threeWay
config variable"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-23
David Aguilar
c
o
n
t
rib/su
b
tree: ignore
log
.
date
c
o
nfigur
a
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-22
Jiang Xin
re
c
e
i
v
e
-
pack
:
crash when checki
n
g with non
-
exist HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Hamano
builtin/send-pac
k
.
c
:
respect us
e
r
.
signingkey
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C
H
am
a
no
Git 2
.
5
.
0-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
David Tu
r
ner
u
npack-trees: don't upd
a
te files
with
C
E_WT_REM
O
V
E
set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Hamano
Merge branch 'tf/gitweb-ty
p
of
i
x'
commit
|
commitdiff
|
tree
2015-07-21
Junio C
Hamano
M
erge tag 'l10n-
2
.
5
.
0-rnd2' of git://github
.
co
m
/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2015-07-17
Charles Bailey
u
n
tracked: fix
d
etection of uname(2)
failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Jun
i
o C Ham
a
no
Merge branch 'jk/still-interesting'
commit
|
commitdiff
|
tree
2015-07-17
Junio C Ham
a
no
Merge branc
h
'es/worktree-add'
commit
|
commitdiff
|
tree
2015-07-17
Eric Sunshine
D
o
c
umentation
/
gi
t
:
f
ix
stale "MUL
T
I
PLE C
H
ECKOUT MODE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Jun
i
o C Hamano
worktree: cau
t
ion that this
is st
i
ll experimental
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Eric Sunshine
Documentation/git-wo
r
ktree: fix s
t
ale "gi
t
che
c
ko
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C
H
a
m
ano
Sy
n
c with
2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Jun
i
o C Ha
m
ano
Gi
t
2
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Junio C Haman
o
Merge b
r
anch 'jc/diff-ws-error-highlight'
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge
b
ranch 'mm/describe-doc' into mai
n
t
commit
|
commitdiff
|
tree
2015-07-15
Jun
i
o C Hamano
Merge branc
h
'
jc/pro
m
pt-d
o
cument-ps1
-
s
tate-s
e
pa
r
ator
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
J
u
n
i
o
C H
a
mano
M
e
rg
e
br
a
nch 'es/osx-header-pollutes-mas
k
-m
a
cro' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
Hamano
Merge branch
'es/utf8
-
s
t
upi
d
-compiler-wo
r
karound
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
M
erge branc
h
'
f
k/
d
oc-format-pat
c
h-vn' into maint
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
io
C
Ha
m
ano
Merge branch 'pt/t0
3
0
2
-need
s
-
s
a
nity
'
into maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Ha
m
a
n
o
Merge branch 'me/
f
etch-into-shallow-
s
afety' i
n
to m
a
int
commit
|
commitdiff
|
tree
2015-07-15
Junio C
Hamano
Merge branch
'
mh/
f
sck-reflog-entr
i
es' into maint
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C
H
a
mano
Merge branch 'af/tcsh-completion
-
noclobber' into m
a
int
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hama
n
o
Merge bra
n
ch 'pa/aut
o
-
gc-ma
c
-osx' into
m
a
int
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merg
e
branch 'jc/d
o
-no
t
-
f
eed-
t
ags-to-clear-c
o
m
m
i
t
-
marks
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio C H
a
man
o
Merge tag 'l10n-2
.
5
.
0-rnd1' of git://github
.
c
om/gi
t
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio C H
a
m
a
n
o
Git
2
.
5
.
0-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-13
Junio
C Hama
n
o
Merge
b
ranch 'es/worktree-add'
commit
|
commitdiff
|
tree
2015-07-13
J
u
nio
C
H
a
ma
n
o
Merge
bran
c
h
'nd/m
u
ltiple-
w
o
r
k-trees'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hama
n
o
M
er
g
e branc
h
'ss/clone-gue
s
s
-di
r
-name-simpl
i
f
y'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
M
erg
e
branch 'kb
/
co
n
fig-unmap-before-
r
e
na
m
in
g
'
commit
|
commitdiff
|
tree
2015-07-13
J
u
nio
C Hamano
Merge branch 'mh/s
t
rb
u
f-
r
ead-fi
l
e-returns-ss
i
ze-t'
commit
|
commitdiff
|
tree
2015-07-13
Juni
o
C Ham
a
no
Mer
g
e branch 'jc/unexp
o
rt-git
-
pager-in-use-in-pager'
commit
|
commitdiff
|
tree
2015-07-13
Juni
o
C Hamano
Merge b
r
anch 'kb/use-nsec-d
o
c'
commit
|
commitdiff
|
tree
2015-07-13
J
u
ni
o
C
Ha
m
a
no
Mer
g
e b
r
anc
h
'js/reba
s
e-i-clean-up-upon-
c
ontinue-t
o
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio
C
Hama
n
o
Me
r
ge
branch 'et/http-proxya
u
th'
commit
|
commitdiff
|
tree
2015-07-13
Junio C
H
a
m
a
no
Mer
g
e branch 'jc/fsc
k
-re
t
ire-requi
r
e-eoh'
commit
|
commitdiff
|
tree
2015-07-12
René Sc
h
arfe
di
f
f: p
a
rse ws-error-
h
i
g
h
light option
more strictly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-12
Junio C Hamano
R
ever
t
"checkout: retir
e
--ignore
-
ot
h
e
r
-workt
r
ees
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-12
Si
m
on A
.
Eu
g
ster
checkout:
d
ocument subtlet
y
around --our
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 last minute
b
its of
f
ixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-10
Junio C Ham
a
no
Merge branch 'cb
/
r
e
b
a
s
e
-am-ex
i
t
-
code'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Haman
o
Merge branch
'
jk/fix-refresh-utime
'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hamano
Merge br
a
nch 'mm
/
br
a
nch-
d
oc-updates'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hamano
Merg
e
bra
n
ch
'
ls/hint-rev-list-count'
commit
|
commitdiff
|
tree
2015-07-10
Junio
C Hamano
Merge branch 'j
k
/rev-list-n
o
-bitmap-while-p
r
uning'
commit
|
commitdiff
|
tree
2015-07-10
Juni
o
C Haman
o
Merge bran
c
h
'
cb/subtree-tests-updat
e
'
commit
|
commitdiff
|
tree
2015-07-10
Ju
n
io C Hamano
Merge branch 'rh/test-c
o
lor-
a
void-terminfo-in-orig
i
n
a
l
.
.
.
commit
|
commitdiff
|
tree
2015-07-10
Ju
n
io C
Hamano
M
e
rge
b
ran
c
h 'sb/p5310-and-chain'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Haman
o
M
e
rg
e
branch 'tb/checkou
t
-doc
'
commit
|
commitdiff
|
tree
2015-07-10
Junio C H
a
man
o
Merge branc
h
'
jk
/
p
retty-e
n
coding-doc'
commit
|
commitdiff
|
tree
2015-07-10
Juni
o
C Hamano
Merg
e
branch 'n
d
/dwim-wildcards-
a
s-p
a
t
h
specs'
commit
|
commitdiff
|
tree
2015-07-09
Junio C Hamano
M
erge branch '
j
k
/maint-for-e
a
ch-
p
a
c
ked-object'
commit
|
commitdiff
|
tree
2015-07-09
J
un
i
o C Hamano
Merge branch 'jc/fix
-
a
l
l
oc-sortbuf-in-inde
x
-pack'
commit
|
commitdiff
|
tree
2015-07-09
Sebastian Schub
e
rt
h
cl
o
ne: simplify
stri
n
g handling i
n
guess_dir_name(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-08
Jeff K
i
ng
ch
e
c
k
_and_freshen_file
:
fix reversed succe
s
s-check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-08
Clemen
s
Buc
h
acher
rebase
:
r
eturn non
-
zero error
c
o
de if format-patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-07
Eric Sunshine
checkou
t
: retire
--ignore-oth
e
r-worktrees in
favor
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-07
Eric Su
n
s
h
ine
wor
k
t
ree: add: au
t
o
-
vivi
f
y new branch when
<
branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Er
i
c Sunsh
i
ne
wo
r
ktree
:
add: make -b/-B defau
l
t to HEAD w
h
en <branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
r
ic
S
uns
h
ine
workt
r
ee: extract
b
asename computation to new f
u
nc
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshi
n
e
checkou
t
:
require worktree uncondi
t
ion
a
lly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric
Sunshine
checkout: retire --to option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Suns
h
ine
tests: worktree
:
retrofit
"checkout -
-
to" t
e
sts for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Suns
h
ine
worktree: ad
d
-b/-B op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next