repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'em/status-rename-config'
2018-05-23
Junio C Ham
a
no
Merge branch 'em/status
-
rename-config'
commit
|
commitdiff
|
tree
2018-05-23
J
unio
C Ha
m
ano
Me
r
ge br
a
nc
h
'c
c
/pe
r
f-
b
isect'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge
b
ranch 'ah/misc-doc-updates'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge
b
ranch 'bp/test-drop-caches'
commit
|
commitdiff
|
tree
2018-05-23
Junio
C
Ham
a
no
Merg
e
branch 'en/unpack-trees-split-index-fix'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio C H
a
mano
Me
r
ge branch 'nd/doc-header'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Haman
o
Merge
b
ranch '
b
c/format-
p
atch-cove
r
-no-attach'
commit
|
commitdiff
|
tree
2018-05-23
Juni
o
C Hamano
M
e
rge branc
h
'
t
b/te
s
t
-apfs-utf8-norm
a
lization'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
H
am
a
no
Merge
b
ranch
'
js/rebase-
r
e
c
r
eate-me
r
ge'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge branch 'nd/pack-obj
e
cts-pack-struct'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge
branch
'en/
r
ename-dir
e
ctor
y
-detection-reboot'
commit
|
commitdiff
|
tree
2018-05-23
J
unio C Hamano
Merge bran
c
h 'js
/
no-p
a
g
er-shorthan
d
'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio
C
Hamano
Me
r
ge branch 'js/rebase-i-clean-msg
-
after-fixup-
c
onti
n
u
e'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
Hama
n
o
Merge
b
r
a
nch
'
t
g/w
o
rktree-a
d
d-existing-branch'
commit
|
commitdiff
|
tree
2018-05-23
Jun
i
o C Hamano
Merge branch
'
js/deprecate-gra
f
ts'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Ha
m
ano
Merge bra
n
ch 'j
s
/test-un
s
et-prereq'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
H
amano
Merge branch 'ab/
p
erl-
p
yt
h
on-
a
ttrs'
commit
|
commitdiff
|
tree
2018-05-23
J
unio C Ham
a
n
o
Merge branch 'sb/oid-ob
j
ect-info'
commit
|
commitdiff
|
tree
2018-05-23
J
u
n
io C Hamano
M
er
g
e
b
ranch 'c
c
/pe
r
f-ag
g
regate
-
unknown-
o
pti
o
n
'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio C Hama
n
o
Merge br
a
nch 'en/git
-
debugger'
commit
|
commitdiff
|
tree
2018-05-23
Jun
i
o C
H
ama
n
o
Mer
g
e b
r
anch 'bw/ser
v
er-options'
commit
|
commitdiff
|
tree
2018-05-23
Junio
C Hamano
Merg
e
bra
n
c
h
'nd/repack-keep-pack'
commit
|
commitdiff
|
tree
2018-05-23
Ju
n
io C Haman
o
Merge branch 'ds/
l
azy-load-trees'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
Ha
m
ano
Merge branch 'nd/term-colum
n
s'
commit
|
commitdiff
|
tree
2018-05-23
J
unio C Hamano
M
er
g
e branch 'sg/t7005-
s
p
aces-in-filenames-clea
n
u
p'
commit
|
commitdiff
|
tree
2018-05-23
Ju
n
i
o
C Hamano
Me
r
ge
branch
'sg/t5516-
f
ixes'
commit
|
commitdiff
|
tree
2018-05-23
Junio C H
a
mano
Merge branc
h
'
sg
/
t5310-jgit-bitmap-t
e
st
'
commit
|
commitdiff
|
tree
2018-05-23
Junio
C
H
aman
o
Merge bran
c
h
'nd
/
pack-
f
ormat-doc'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
H
amano
Merge branch 'jk/apply-p-do
c
'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge branch 'a
o
/c
o
nfig-api-doc'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio C Ha
m
ano
M
e
rge br
a
nch 'bc/mailm
a
p-self
'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge branch 'sb/object-store-replace'
commit
|
commitdiff
|
tree
2018-05-23
Junio
C
Hama
n
o
Mer
g
e
br
a
nch 'hn/s
o
rt
-
ls-remote'
commit
|
commitdiff
|
tree
2018-05-21
Jeff King
g
et_ma
i
n
_
ref_store: BUG() when outside a
repos
i
tory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-17
S
tefan Beller
object
.
c: clear
r
eplace ma
p
before
f
reei
n
g it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-15
SZE
D
ER Gábor
t
7005
-
ed
i
tor: get rid of the SPACES_IN_FILENAME
S
prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
R
ené Scharfe
t5512: r
u
n git fetch
inside test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
Ng
u
yễn Thái Ngọ
c
D
u
y
column: fix of
f
-by-one defau
l
t width
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
J
e
f
f
King
p
a
ger: set COLUMNS to term_co
l
umns()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
Ngu
y
ễn
T
hái
Ngọc Duy
pack-for
m
at
.
tx
t
: more details on pack file format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
Je
f
f King
apply: clar
i
fy "-p" docum
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
SZEDER Gábor
t5
5
16-fetch-p
u
sh: fix
b
rok
e
n &&-
c
hain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
SZEDER
Gáb
o
r
t5516-fet
c
h-p
u
sh:
fix 'pus
h
with dry
-
run'
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
SZEDER Gábor
t
5310-pack
-
b
i
t
m
a
p
s: make JGit tes
t
s
w
ork with GIT_TEST
_
SPLIT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
Antonio
Ospite
doc: fix co
n
fig API documentation about config
_
with_opti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
S
tefan Bell
e
r
repla
c
e-o
b
ject
.
c: remov
e
the_repository from prepare_replace
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
Stefan Beller
o
bj
e
ct
.
c: f
r
ee
r
eplace map
i
n raw_o
b
jec
t
_store_
c
lea
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-rec
u
rsive: fix
check f
o
r sk
i
pabil
i
ty
of wor
k
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ij
a
h
Ne
w
ren
merge-recursive: make "
A
uto-merging" comment sho
w
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recursive: fix remainder o
f
was_dirty
(
) to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recursive: fix
w
as_trac
k
ed() to quit lying with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
t6046: testcases checking
w
h
e
t
h
e
r
updates can be
s
kipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recurs
i
ve
:
av
o
id trigge
r
ing add_cach
e
info er
r
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive:
m
ove
more
i
s
_
dirty
handling to merge_c
o
ntent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recursive: improve add_
c
a
c
h
e
i
nfo error hand
l
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h
Newr
e
n
merge-recursive: avoid
s
p
u
rious rename
/
r
enam
e
c
o
nflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
dir
e
ctory
renam
e
d
e
t
e
ction: new testcases showca
s
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
j
a
h
N
e
wren
merge
-
recu
r
s
ive: fi
x
remaini
n
g directory rena
m
e
+
d
irty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merg
e
-
r
ecursive: f
i
x overwri
t
ing dirty fil
e
s
i
nvolved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
mer
g
e-recurs
i
ve: avo
i
d clobbering u
n
t
r
acke
d
files wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah Newr
e
n
m
e
r
g
e-recursive:
apply n
e
c
essary modificat
i
ons for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erg
e
-recurs
i
v
e
: when compa
r
i
ng fil
e
s,
d
on't include
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
r
g
e-recursive: c
h
eck f
o
r file le
v
el conflicts then
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newr
e
n
merge-recursiv
e
:
add computatio
n
of collisions due
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
m
e
rge-re
c
ursive: check
f
o
r
d
i
rectory l
e
v
el co
n
flicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
wr
e
n
merge-recursive: add
get_di
r
ectory_renames()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Jun
i
o C Hamano
The fifth bat
c
h for 2
.
1
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
J
unio C Hama
n
o
Merge
b
ranch
'
m
a/http-walke
r
-no-par
t
ial'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
Me
r
ge
b
r
anch
'
js/runtime-prefix'
commit
|
commitdiff
|
tree
2018-05-08
Ju
n
io C Hamano
M
e
rg
e
branch 'js/colored
-
pu
s
h
-er
r
ors
'
commit
|
commitdiff
|
tree
2018-05-08
Junio
C
Ha
m
ano
Me
r
ge branch 'jc
/
p
arseop
t
-ex
p
iry-error
s
'
commit
|
commitdiff
|
tree
2018-05-08
Junio C
H
amano
M
e
rge b
r
anc
h
'ma
/
f
ast-
e
xport-
s
kip-merge-fi
x
'
commit
|
commitdiff
|
tree
2018-05-08
Ju
n
io C Ha
m
ano
Merge branch 'tz/doc-git-urls-reference'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
Merge branch
'
t
g
/demote-stas
h
-save-in-com
p
letion'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Haman
o
Merg
e
branch 'sa/send-email-dedup-som
e
-header
s
'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
M
erge branch 'nd/
s
ubmodule-status
-
fix'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
M
e
rge branch 'js/iden
t
-date-fix'
commit
|
commitdiff
|
tree
2018-05-08
Junio C H
a
mano
Me
r
ge branch
'
bt/gpg-
i
nterface'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
Merge b
r
anc
h
'hn/sort-l
s
-rem
o
t
e'
commit
|
commitdiff
|
tree
2018-05-08
Jun
i
o C Hamano
Merge
branch
'ab/git-s
v
n-get-record-ty
p
ofi
x
'
commit
|
commitdiff
|
tree
2018-05-08
Junio
C
Hamano
Mer
g
e branch
'tb/config-def
a
ult'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
M
er
g
e branch 'tb/co
n
f
i
g-type'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
Merge b
r
anch 'sg/
d
oc-
g
c-quote-mism
a
tch
-
fix'
commit
|
commitdiff
|
tree
2018-05-08
Jun
i
o C
Hamano
M
e
rge b
r
anch 'sg/completion-clear-cached'
commit
|
commitdiff
|
tree
2018-05-08
Junio C
Hamano
Merge branch 'sb/worktree-remove-opt-
f
or
c
e'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
Merge branch 'ma/double-dashes-
i
n-docs'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
M
e
r
ge branch 'tq/
t
15
1
0'
commit
|
commitdiff
|
tree
2018-05-08
Junio C
H
a
m
a
no
M
e
rge branch 'so/glossary
-
a
n
cestor'
commit
|
commitdiff
|
tree
2018-05-08
J
unio C Hamano
Merg
e
br
a
nch
'
ls/check
o
ut
-
encodi
n
g'
commit
|
commitdiff
|
tree
2018-05-08
Junio
C
Hama
n
o
M
erge
b
ran
c
h
'
ab/nuke-emacs-co
n
trib'
commit
|
commitdiff
|
tree
2018-05-08
Jun
i
o C H
a
man
o
Merge branch '
n
d
/warn-more-f
o
r-d
e
v
s'
commit
|
commitdiff
|
tree
2018-05-08
Ju
n
io C
H
aman
o
Merge branch 'sb/object
-
s
t
ore-replace'
commit
|
commitdiff
|
tree
2018-05-08
Junio
C
H
a
ma
n
o
Merge bra
n
ch 'ds/commit-graph'
commit
|
commitdiff
|
tree
2018-05-08
J
unio C Hamano
Mer
g
e branch 'js/e
m
pty-c
o
nfig-s
e
c
tion-
f
i
x
'
commit
|
commitdiff
|
tree
2018-05-08
Junio C
Hamano
Me
r
g
e
branch
'
o
t/libif
y
-g
e
t-ref-atom-value'
commit
|
commitdiff
|
tree
2018-05-08
J
unio
C
Hamano
M
erge b
r
anch 's
b
/submo
d
ul
e
-move-nested'
commit
|
commitdiff
|
tree
2018-05-08
Junio C
Haman
o
Merge branch 'dj/runtime-pref
i
x'
commit
|
commitdiff
|
tree
2018-05-08
Jun
i
o C H
a
mano
Merge branch 'ab/simplify-perl-makefile'
commit
|
commitdiff
|
tree
2018-05-08
Junio
C
Ha
m
ano
Merge branch 'bw/prot
o
col
-
v2'
commit
|
commitdiff
|
tree
2018-05-08
brian
m
.
carlson
mailma
p
:
updat
e
brian m
.
carlson's em
a
il a
d
dress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next