repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: check for file level conflicts then get new name
2018-02-14
Elijah N
e
w
ren
m
erg
e
-re
c
ursive: chec
k
f
or file level conflicts t
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
ja
h
Newre
n
mer
g
e-recu
r
sive: add
c
om
p
utation
of collisions
due
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
merge-recursiv
e
: c
h
e
ck fo
r
directory
l
evel conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
N
ewre
n
merge-recursive: add get_directory_re
n
ames()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
merge-recu
r
sive: m
a
ke a helper f
u
nct
i
on for clea
n
up
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
me
r
ge-rec
u
rsive: split out
c
ode for determining diff_file
p
airs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: make !o-
>
de
t
ect_renam
e
codepath mo
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
mer
g
e-recursive:
fi
x
leaks of al
l
ocated rename
s
a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
merge-rec
u
rs
i
ve: introduce ne
w
functions
t
o handle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
mer
g
e-recur
s
ive:
m
ov
e
th
e
get_renames() function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename dete
c
ti
o
n:
tests for
h
an
d
ling overwriting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename
d
etec
t
ion
:
tests
for handling
o
v
e
r
writing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dir
e
ct
o
ry rename detection
:
miscell
a
neous testcases
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detec
t
ion
:
test
c
ases exploring possibly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
e
w
r
en
d
irectory rename detection: mor
e
invo
l
ve
d
e
d
ge/corner
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
directory rename detection
:
t
estcase
s
chec
k
ing which
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newr
e
n
directory rename detecti
o
n
: files/directories in t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h N
e
wren
d
irectory rename d
e
t
ection:
p
a
rtial
l
y r
e
n
a
me
d
directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah
Newren
director
y
rena
m
e detec
t
io
n
: testcases to
avoid taking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
directory rename dete
c
t
ion: directory splitting testcases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dire
c
tory rename detection: basic
t
estc
a
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
me
r
ge-rec
u
rsive
:
ad
d
e
x
p
l
anat
i
on for sr
c
_entry
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ijah Newr
e
n
m
erge-recur
s
i
v
e: fix
logic ordering
i
ss
u
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Ne
w
ren
Tighten
and correct a few te
s
t
c
ases fo
r
merging and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-17
J
u
nio C Hamano
Git 2
.
16
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-16
Jun
i
o C H
a
m
ano
M
e
r
g
e ta
g
'
l10n
-
2
.
16
.
0-r
n
d
2
' o
f
g
it://github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-01-12
SZ
E
DE
R
Gábor
R
elNotes: min
o
r typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-11
Jun
i
o C Ha
m
ano
Git 2
.
16-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-11
Junio C Ham
a
no
Merge
b
ranch 'jh/obj
e
ct-filte
r
ing'
commit
|
commitdiff
|
tree
2018-01-11
Junio C
Hamano
Merge
b
ranch
'
tg/work
t
ree-c
r
eate-tracking'
commit
|
commitdiff
|
tree
2018-01-11
Jun
i
o C
H
aman
o
Mer
g
e
branch 'js/test-with-ws-in-path'
commit
|
commitdiff
|
tree
2018-01-11
Ralf Thielow
Documentation/git-
w
orktree
.
txt: ad
d
miss
i
ng `
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
Beat Bol
l
i
t3900: add some more quote
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
Junio C Hamano
RelNotes u
p
date before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
Junio
C
Hamano
Merge
branch 'js/perl-path-workaround-in-tests'
commit
|
commitdiff
|
tree
2018-01-10
Junio C Hamano
Merge br
a
nch 'ew/empty-m
e
rge-with-dirty-index'
commit
|
commitdiff
|
tree
2018-01-10
Junio C Haman
o
Merge
branch 'ma/bisect-leakfix'
commit
|
commitdiff
|
tree
2018-01-10
Junio C Hamano
Merg
e
b
r
anch 'js/fix-merg
e
-arg
-
quot
i
ng-in
-
rebase-p'
commit
|
commitdiff
|
tree
2018-01-10
Johannes Schindelin
mi
n
gw
:
handle GITPERLLIB in t0021 in a Windo
w
s
-
c
ompatible way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Junio C
H
amano
M
erge branch 'jk/
d
oc-diff-opt
i
o
n
s
'
commit
|
commitdiff
|
tree
2018-01-09
Junio C
H
amano
M
e
rge branc
h
'bw/proto
c
ol-v1'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge bran
c
h 'sg/travis-c
h
eck-untracked'
commit
|
commitdiff
|
tree
2018-01-09
Junio
C
Hamano
Mer
g
e
branch 'js/test-with-
w
s-in-pa
t
h'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge
branch 'bc/sub
m
i
tting-patches-in-asc
i
idoc'
commit
|
commitdiff
|
tree
2018-01-09
Juni
o
C
Hamano
Me
r
ge branch
'sg/travis-skip-identical-test
'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge
br
a
nch 'a
b
/dc
-
sha1-loose-
e
nds
'
commit
|
commitdiff
|
tree
2018-01-09
Jun
i
o C Hamano
Merge branch '
s
g
/
t
ra
v
is-fixe
s
'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge branch 'js/misc-git-gui-stuff'
of
.
.
/git
-
gui
commit
|
commitdiff
|
tree
2018-01-09
Johanne
s
Schindelin
git-gui:
allow Ctr
l
+
T
to toggle multiple paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Joha
n
nes S
c
hindelin
git-gui: fix e
x
ception when trying to stage with empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
J
o
hannes Schinde
l
in
g
i
t-gui:
a
void ex
c
eption upon Ctrl+T in an empty list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Johannes Schinde
l
in
git gui: fix sta
g
i
n
g a sec
o
nd line to
a
1-line file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Jun
i
o C Hamano
Merge br
a
n
c
h '
e
w/empty-merge-
w
ith-dirty-inde
x
-maint
.
.
.
commit
|
commitdiff
|
tree
2018-01-09
J
u
nio C Haman
o
mer
g
e
-recursive: do
n
ot look at
t
he i
n
dex during recursi
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-08
T
h
omas Gummerer
oidset:
don't return va
l
ue from
o
idset
_
init
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Gi
t
2
.
16-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-05
Junio C
H
amano
M
e
rge
b
r
an
c
h 'js/
s
equencer-cleanups'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Ha
m
ano
Merge branc
h
'jh/memihash-opt'
commit
|
commitdiff
|
tree
2018-01-05
J
unio
C Hamano
Merge branch 'tb/test-lin
t
-wc-l'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
M
e
r
g
e branch 'rs/use-argv-
a
rray
-
in-
c
hil
d
-proc
e
s
s
'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hama
n
o
Mer
g
e branc
h
'ld/p4-mult
i
ple-shelves'
commit
|
commitdiff
|
tree
2018-01-05
Junio C
Hamano
M
erge branch 'jd/fix-strbuf-add-urlencode-bytes
'
commit
|
commitdiff
|
tree
2018-01-05
Jun
i
o C Hamano
M
e
rge bra
n
c
h 'ew/empty-merge-
w
it
h
-di
r
ty-index'
commit
|
commitdiff
|
tree
2018-01-05
Junio C H
a
mano
Merge branch 'd
b
/
d
oc-config-s
e
c
ti
o
n-names-with-bs'
commit
|
commitdiff
|
tree
2018-01-05
Junio C H
a
mano
M
e
r
ge br
a
nch 'jk/test-suite-tracing'
commit
|
commitdiff
|
tree
2018-01-05
Johanne
s
Schind
e
l
in
rebase -p: fix quoting when calling `git merge`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-04
Jeff King
docs/d
i
ff
-
op
t
ions: clarify scop
e
of d
i
ff-filter t
y
pes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-04
To
d
d Zullinger
h
ttp: fix v1
proto
c
ol
t
ests
with apache httpd < 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Johan
n
es Sch
i
ndelin
t0302 & t3900: add forgo
t
ten q
u
otes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Johanne
s
Schindelin
Allow the
t
est sui
t
e to pass i
n
a direc
t
ory wh
o
se n
a
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Æ
v
a
r
Arnfjörð
Bjarmason
bisect: fix a r
e
gression causing a segfa
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
To
d
d Zull
i
nger
doc/SubmittingPatches:
i
m
p
r
ove text formatting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
SZEDER
Gábor
travi
s
-ci: check t
h
at all bui
l
d
a
r
tifac
t
s
a
re
.
g
i
tig
n
ore-d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
SZEDER Gábor
tr
a
vis-ci:
don't store P4 and Git L
F
S in the
working
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
SZEDER
G
á
bo
r
tr
a
vis-ci: record a
n
d
skip
s
ucces
s
ful
l
y
b
uilt trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
SZE
D
ER Gábor
travis-ci: create t
h
e
cache dire
c
tory ear
l
y in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
SZEDER Gá
b
o
r
travis-ci:
p
rint the "tip
of branch i
s
exactly
at
tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-28
J
unio C Ha
m
ano
Gi
t
2
.
1
6-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-28
Juni
o
C
Hama
n
o
Merge branc
h
'sb/d
e
sc
r
ibe-blob'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merg
e
branch 'h
i
/
m
erge-verify-sig-co
n
fig
'
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o C Hama
n
o
Me
r
ge
branch '
w
s/curl-http-prox
y
-over-http
s
'
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o
C
H
ama
n
o
Merge branch 'ks/
d
oc-previous-checkou
t
'
commit
|
commitdiff
|
tree
2017-12-28
J
u
ni
o
C
Ham
a
n
o
Merge branch 'ks/rebase-e
r
r
or-me
s
sa
g
es'
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o
C Hamano
Merge branch 'sr/http-sslverify-con
f
ig-doc'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
M
e
rge branc
h
'nm/
i
map-sen
d
-q
u
ote-server-fo
l
d
er-name
'
commit
|
commitdiff
|
tree
2017-12-28
J
unio C Hamano
Merge branch '
b
p/fsmonitor'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Ham
a
no
Merge branch
'
j
h/par
t
ial-clon
e
-doc'
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o C
H
amano
Me
r
ge branch 'j
t
/
transpo
r
t-hid
e
-vtable'
commit
|
commitdiff
|
tree
2017-12-28
Junio
C
H
a
mano
Me
r
g
e
branch 'j
s
/enhanced-
v
ersion-info'
commit
|
commitdiff
|
tree
2017-12-28
J
unio C H
a
ma
n
o
M
e
rge bran
c
h 'tz/lib
-
gi
t
-svn-svnser
v
e-tes
t
s'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Ham
a
no
M
e
rg
e
br
a
nch 'ew/sv
n
-crlf'
commit
|
commitdiff
|
tree
2017-12-28
Ju
n
io C Ha
m
a
n
o
M
e
rge
b
ran
c
h 'c
c
/
skip
-
to-op
t
ional-
v
al'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Mer
g
e b
r
anc
h
'ra
/
pr
o
mpt-e
r
e
a
d-fix'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge
branch 'bw/path-doc'
commit
|
commitdiff
|
tree
2017-12-28
Æva
r
Arn
f
j
örð Bjarmas
o
n
Ma
k
e
f
il
e
: NO_
O
PENSSL=1 should no longe
r
imply BLK_SHA1=1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Johannes Sc
h
indelin
seq
u
encer: d
o
not invent whitespace when
t
r
an
s
forming
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Johanne
s
Schindelin
sequen
c
er:
r
epo
r
t when noop
has an argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
J
ohannes Schindelin
seq
u
encer: remove s
u
perfluous conditi
o
nal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
J
o
hanne
s
Sc
h
indelin
sequencer:
strip bogus LF at end of error me
s
sa
g
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Joha
n
ne
s
Schi
n
delin
rebase: do not continue wh
e
n
t
he todo
l
ist gene
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next