repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Fix code checking for D/F conflicts still being present
2011-08-14
E
l
ijah Newre
n
m
e
rge-recursive:
Fix code checking f
o
r D/F confli
c
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah New
r
en
merge-recursive:
F
ix sort
i
n
g
o
r
d
e
r a
n
d director
y
ch
a
nge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Fix r
e
c
ur
s
ive case
with D/F confli
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive
:
Avoid working directo
r
y ch
a
n
ges during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-rec
u
rsive: Re
m
em
b
er to free gener
a
ted unique
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Newren
merge
-
recursi
v
e: Co
n
s
o
lidate different update_s
t
ages
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recursive: M
a
rk some dif
f
_filespec st
r
uct arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newre
n
merge
-
recursive
:
Corr
e
ct a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
merge-recursive: Make BUG messa
g
e more legible b
y
a
d
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newr
e
n
t60
2
2: Ad
d
testc
a
se for merg
i
ng a renamed file w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
ren
t602
2
: New tests ch
e
c
king for
unnecessary upda
t
es
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
022: Re
m
o
ve unnecessary
u
n
t
racked files to make test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6036:
criss-cross + rename/rename(1to2)/add-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: cri
s
s-cros
s
w/
rename/rename(1to2)/modify+rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t603
6
: tests for cris
s
-
cross merges with
v
arious directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6036: cri
s
s-cross with weird content
can fool git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6
0
36: Add
d
iffere
n
tly resolved modify/delete conf
l
ict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
New
r
en
t6042: Add failing testc
a
ses for re
n
ame/re
n
ame/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t604
2
: Ensure rename
/
rename con
f
licts lea
v
e i
n
dex and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6042:
Add tests
f
or content issu
e
s with mod
i
fy/renam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
4
2: Add a testcase where undetected rename causes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newre
n
t604
2
: Add a pair of cases
w
he
r
e undetected
renames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6042:
Add f
a
iling te
s
tcase for rename/modify/a
d
d-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
r
e
n
t6042: Add a te
s
tcase
wh
e
re gi
t
del
e
t
e
s an
u
ntracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim Meyeri
n
g
fetch:
d
o not leak a r
e
f
spec
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 H
a
mano
Merge bra
n
ch
'
j
k/
m
aint-co
n
fig-a
l
ias-fix' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C Hamano
Merge branch
'
jc/fmt-req-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
u
n
i
o
C Hamano
Me
r
g
e
b
r
anch 'j
k
/maint-docs
'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge
branch 'jn
/
d
o
c-re
m
ote-helpers'
i
nto maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
ano
Merge
b
r
a
n
ch 'kk/ma
i
nt-prefix-in-c
o
n
f
ig-
m
ak' i
n
to maint
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyeri
n
g
di
f
fco
r
e-rename
.
c: avoid set-but-not-used war
n
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Haman
o
Start 1
.
7
.
5
.
4 d
r
aft
r
e
lease notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
J
u
n
io C Hamano
Merge branch 'tr/
a
dd-i-no-escap
e
' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Junio C H
a
mano
Merge br
a
n
c
h 'vh
/
config-interactive-sing
l
ekey
-
doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio
C Hamano
Merge bra
n
ch 'ml/test-
r
ea
d
me' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io
C Hamano
Merg
e
branch 'ab/i18n-f
i
xu
p
' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio
C
Hamano
Me
r
g
e
branch 'jc/rename-degrade-cc-to-
c
' into maint
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
Merge branch 'rr/doc-con
t
e
nt-type' into main
t
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Nieder
Do
c
ume
n
t
ation: do no
t
mi
s
interpret re
f
specs as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C
Hamano
Merge branch '
j
m
/maint-mi
s
c-fix' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio
C Hama
n
o
Merge branch 'bc/main
t
-
s
u
bmodule-fix-
p
arked' into m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch
'bc/main
t
-api-doc-parke
d
' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch 'jn/run-command-error-failure' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
config
.
mak
.
in:
allow "confi
g
ure
-
-sysco
n
fdir=/else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
doc
s
:
f
i
x some ant
i
que exa
m
ple output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
J
eff Kin
g
docs: make sure literal
"->" isn't
converted to a
r
row
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
J
eff King
docs:
u
p
d
ate status
-
-porcelain f
o
rmat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: minor grammar fix
e
s to git-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Casey
git-submodule
.
sh: se
p
arate parens by a space
t
o avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Bra
n
don Cas
e
y
D
o
cumentation
/
techni
c
al/api-diff
.
txt: correct name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
re
a
d_gi
t
file_ge
n
tly
:
use
ssize_
t
to hold read result
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
remove test
s
of always-fa
l
s
e
condition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Mey
e
ring
rerere
.
c: diagnose
a corrupt MERGE_RR when hitting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Ham
a
no
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
uni
o
C Hamano
Me
r
ge br
a
nch 'maint-1
.
7
.
4' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
branc
h
'jk/git
-
conne
c
tion-deadl
o
c
k
-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
a
n
o
M
e
rge branch 'js/mai
n
t-se
n
d-pack-st
a
teless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Me
r
ge branch 'jk/maint-upload-pack-sh
a
llow' into maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branch 'j
m
/
m
aint-diff-words-w
i
th-sbe' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e b
r
anch 'kk/maint-prefi
x
-in-config-mak' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge bra
n
c
h 'm
g
/diff-uico
n
fig-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Merge branch 'ft/gitweb-tar-w
i
th-gz
i
p
-
n' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C H
a
mano
Mer
g
e
branch 'ss/doc-s
v
n
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge branc
h
'j
n
/for
m
at-p
a
tch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
M
erge branch 'jc/maint-pathspe
c
-stdi
n
-an
d
-c
m
dline
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Mer
g
e
branch 'jk/cherry-p
i
c
k
-
r
oo
t
-with-r
e
solve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
M
erge
b
r
anch 'rg/copy-gecos-username' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Merge bra
n
ch 'fc/completio
n
-zsh' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Ha
m
ano
Merge branc
h
'j
k
/g
i
t
-connection-
d
eadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Haman
o
Merge br
a
n
c
h 'js
/
m
a
i
nt-send-pack-state
l
ess-rpc-
d
eadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge
b
ranch 'svn-fe-ma
i
nt' of git:/
/
repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Ham
a
no
u
serformat
_
find_requ
i
re
m
ent
s
(
)
: find requ
i
r
e
ment for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen T
h
ai
N
g
o
c D
u
y
init/c
l
o
ne: remove sho
r
t option
-
L
and document --separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio C H
a
mano
handle_options(): do not
miscount
h
ow many arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Je
f
f
K
i
ng
c
onfig: always p
a
rse G
I
T_CONFIG
_
PARAMETERS d
u
ring git
_
conf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
git_c
o
nfig
:
don't peek at global config_
p
arameters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config:
m
ake en
v
i
ronm
e
nt
p
arsing routin
e
s
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Ji
m
Meyering
do no
t
r
ead be
y
o
nd e
n
d
of malloc'd buff
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael
J
Gruber
git-s
v
n: Fix g
i
t svn log --show-co
m
mit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
H
amano
G
it 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
o
nathan Nieder
provide a copy of
t
he LGPL
v
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff
King
tes
t
c
o
re
.
gitp
r
o
xy
configu
r
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Rafa
e
l Gieschke
c
opy_gecos: f
i
x not adding
n
l
e
n to l
e
n when proce
s
s
i
ng "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Thomas Rast
add -i: i
g
nore
te
r
mina
l
escape sequences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
u
n
io C Hamano
M
erge branch 'js/maint-1
.
6
.
6-send-pack-state
l
ess-
r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update
d
raft release notes
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 Hamano
Mer
g
e bran
c
h
'
jn/maint-format-patch-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branc
h
'ss/che
r
ry-pick-
x
-doc'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C Hamano
Merge branch 'vr/merge-b
a
se-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge bran
c
h 'sr/maint-
f
ast-im
p
ort
-
tighten-
o
ptio
n
-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Ha
m
ano
Merge branch 'jc/t
1
506-shell-par
a
m-expansi
o
n-go
t
cha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Hamano
Merge branch
'jc/fix-add-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge b
r
anc
h
'
jn/gitweb-dependency
'
i
n
t
o main
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C H
a
mano
Mer
g
e
branc
h
'jc/maint-branch-mer
g
e
opti
o
ns'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'j
c
/maint-a
d
d-p-overlapp
i
n
g-hu
n
ks'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Document
a
tion/git-fsck
.
t
x
t: fix
t
ypo: unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
s
e
nd-pac
k
: avoid deadloc
k
on git:// push w
i
th failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
connect: let callers know if
c
o
n
nection is
a
socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f King
connect: treat
g
ene
r
ic
p
roxy processes li
k
e
s
sh
processes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next