repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Split was_tracked() out of would_lose_untracked()
2011-08-14
Elijah Newren
merge-rec
u
rsive: Spl
i
t
w
a
s
_
tracked()
out
o
f w
o
uld_lose_untra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
r
e
n
merge-re
c
ursive: S
a
ve D/F con
f
lict filenames instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wre
n
merge
-
recu
r
sive: Fix code
checki
n
g for
D
/F conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
me
r
ge-recur
s
ive: Fix sorting order and dir
e
ctory chang
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newre
n
merge-recursive: Fix r
e
c
u
rsive ca
s
e with D/
F
conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
a
h
New
r
en
merge-recur
s
ive:
A
void working directory changes dur
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
e
rge-rec
u
r
s
ive
:
Rem
e
m
b
e
r to free generated uniq
u
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
ewren
merge-recursive: Consolid
a
te different up
d
a
t
e
_
sta
g
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursive: Mark so
m
e diff_
f
ilespec str
u
ct
arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
mer
g
e-recur
s
ive
:
Correct a com
m
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newre
n
merg
e
-recursive:
M
ake BUG message more leg
i
ble by adding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t602
2
:
Add testcase for merging a
rena
m
ed file wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h Ne
w
ren
t6022:
New tests checking
f
or unnecessar
y
updates
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6022: Remove unnecessary untrack
e
d files t
o
m
a
ke
test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Ne
w
r
e
n
t6036: criss-cros
s
+ rename/renam
e
(1to2)/add-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
re
n
t6036: criss
-
c
r
oss w/
rename/rename(1to
2
)/mod
i
fy+re
n
ame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Ne
w
ren
t6036: tests for criss-cross merges with vario
u
s directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss-cro
s
s with we
i
rd content c
a
n
fool
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6036:
A
d
d
d
i
f
ferently resolve
d
modif
y
/delete conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
t6042: A
d
d fa
i
lin
g
test
c
a
ses for rename/re
n
ame/a
d
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6042: Ens
u
re ren
a
me/
r
ena
m
e conflicts
l
e
ave index and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6042:
Add tests for
content issues w
i
th modify
/
rena
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
t6042: Add a testcas
e
where und
e
tected
r
ename
c
a
u
ses
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
ah Newren
t6042: Add a
p
air
of c
a
ses where undetected renames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
r
e
n
t6042: Add failing testc
a
se
for rena
m
e/modify/ad
d
-so
u
r
ce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6042:
A
dd a testc
a
se wher
e
git deletes an untrack
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim Meyering
fetch: do
n
ot lea
k
a refspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Git 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge bra
n
ch 'jk/maint-config-al
i
as-fix'
into
m
ain
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge
b
ranch '
j
c/fmt-req-fix
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge bran
c
h
'
jk/maint-do
c
s' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch 'jn/doc-remote-helpers' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
M
e
rge
b
ranch 'kk/
m
aint-prefix-in-config-m
a
k' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
im Meyering
di
f
f
core-ren
a
me
.
c: avoid
set-but-not
-
used warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
i
o
C
H
a
m
a
no
Sta
r
t 1
.
7
.
5
.
4 draft release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge branch 'tr/add-
i
-no-escape'
i
nt
o
main
t
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Hamano
Merge branch 'vh/co
n
fig-interactive-sin
g
lekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
Hamano
M
e
rge bran
c
h
'
ml/
t
e
st-readm
e
' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hama
n
o
Merge br
a
n
c
h
'ab/i18n-fixup' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge b
r
a
nch
'jc/rename-degrade-cc-to-c' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
a
m
an
o
Merge b
r
an
c
h 'rr/doc
-
content-type'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Nieder
Do
c
umentation: do no
t
misinterpret refs
p
ecs as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch '
j
m/maint-mi
s
c-fix' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
M
e
r
ge branch 'bc/mai
n
t-sub
m
odule-fix-parked'
into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C
Hamano
Merge bran
c
h
'
bc/m
a
int-api-doc-park
e
d
' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C
Hamano
Merge
b
ranch 'jn/run-
c
ommand-er
r
or-fai
l
ure' into maint
commit
|
commitdiff
|
tree
2011-05-27
J
unio C Hama
n
o
config
.
mak
.
in: al
l
ow
"
configure
-
-
s
y
s
c
onfdir=/else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
J
eff Kin
g
docs
:
fix some a
n
tique example output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
d
o
cs
:
make
s
ure literal "
-
>" isn't
converted
t
o
a
rrow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: update
stat
u
s
-
-
p
o
r
celain
f
ormat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f Ki
n
g
docs
:
minor grammar fixes to git
-
status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
B
r
andon Casey
gi
t
-submodule
.
s
h: se
p
arate parens by
a
space to avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Casey
Docum
e
ntation/t
e
chni
c
a
l
/api-diff
.
txt: cor
r
ect name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f Ki
n
g
read_gitfile_g
e
ntly: use ssize_t to hold rea
d
result
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Ji
m
Meyering
remove
tests
o
f always-false conditio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyer
i
ng
rere
r
e
.
c: diagno
s
e
a c
o
rrup
t
MERGE_RR
w
he
n
h
ittin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Gi
t
1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'main
t
-1
.
7
.
4'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
aman
o
Merge branch '
j
k/g
i
t-connection-deadl
o
ck-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Merge branch '
j
s
/
maint-send-p
a
ck-state
l
ess-rpc-d
e
a
d
lock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/mai
n
t-upload-pack-s
h
allow' in
t
o
m
a
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge branch 'jm/maint-
d
iff-words-with-sbe' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bran
c
h 'kk/ma
i
nt-prefix-in-conf
i
g-mak'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C Hamano
Merge branch
'
mg/diff-ui
c
onfig-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio
C
Haman
o
Merge b
r
anc
h
'ft/gitweb-
t
ar-with
-
gzip-n' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
J
u
ni
o
C
Hamano
Merge branch '
s
s/doc-svn' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge
b
ranch 'jn/
f
or
m
at
-
patch-doc' into main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hama
n
o
Me
r
g
e branch 'jc/maint-p
a
thspec-stdin
-
and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio
C Hamano
Merge branch 'jk/che
r
ry-pick-ro
o
t-with-re
s
ol
v
e' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Mer
g
e branch 'rg/copy-gecos-
u
se
r
name'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch
'fc/completion-zsh
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge branch 'jk/git-connect
i
on-dea
d
lo
c
k-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e branch 'js/maint-send-pack-s
t
ate
l
ess-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Mer
g
e branc
h
'
s
vn-f
e
-mai
n
t' of
g
it://repo
.
o
r
.
c
z
/
git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Ham
a
no
u
s
e
rformat_find_r
e
q
uiremen
t
s(): find requirement f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguye
n
T
h
a
i
Ngoc Duy
init/
c
lo
n
e: remove short op
t
ion -L and document --separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
J
unio C Hamano
handle_options():
d
o not miscount how m
a
ny argume
n
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config: a
l
wa
y
s
p
arse GIT_CONFIG_PARAMETE
R
S during git_conf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
git_config: don
'
t p
e
ek at glob
a
l config_parameters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
J
eff King
con
f
i
g: make envir
o
nment parsi
n
g rout
i
nes
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jim M
e
y
e
ring
do no
t
read be
y
o
n
d
end of malloc'd
b
uffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Mich
a
el
J Gruber
git-s
v
n: Fix git
s
vn log --sh
o
w-commi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio
C Ham
a
no
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonat
h
an Niede
r
pro
v
ide a
co
p
y of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test
core
.
gitproxy con
f
igura
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Ra
f
ael Gieschke
co
p
y
_gecos:
f
ix
not add
i
ng nlen to len when processing "&
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Thomas Rast
a
d
d
-i
:
ignore
terminal escape sequ
e
n
c
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C
Ham
a
no
Merge b
r
anch 'j
s
/maint-
1
.
6
.
6-send
-
pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Update draft
r
elease
note
s
t
o
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o C Ham
a
no
Merge b
r
anch 'jn/m
a
int-format-p
a
tch
-
doc' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bra
n
ch 's
s
/cherry-pick-x-
d
oc'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge bra
n
ch
'vr
/
merg
e
-
b
ase-
d
oc' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch 'sr/maint-fast-i
m
port-tigh
t
e
n
-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/t
1
506
-
she
l
l
-
param-expansio
n
-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge branch 'jc/fix-add-u-unmerged'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Hamano
Merge bra
n
c
h
'
jn/gitweb-depen
d
ency' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/
m
aint-branch-mergeo
p
tions
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge
b
ranch 'jc/maint-add-p-overlapping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Documenta
t
io
n
/git-f
s
ck
.
txt: f
i
x
t
ypo
:
unreadable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
n
g
s
e
nd-pa
c
k: avoi
d
d
eadloc
k
on git://
p
u
s
h
with fail
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next