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
Elijah Newren
me
r
ge-recursive: Fix code c
h
ecking for D/F c
o
nfli
c
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newr
e
n
merge-recursive: Fi
x
sor
t
i
n
g order and directo
r
y change
.
.
.
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
m
erge-recursive:
Fix recursive case with D/F con
f
lict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newren
merge-recursive: Avoi
d
wor
k
ing director
y
changes du
r
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
merge-
r
e
c
ursive
:
Reme
m
ber to fr
e
e gene
r
ated
u
n
ique
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h N
e
w
r
en
merge-recursive:
Consoli
d
ate dif
f
eren
t
up
d
ate
_
stages
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Mark some diff_filespec stru
c
t
arguments
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Corre
c
t a com
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Newren
me
r
ge-
r
e
cursive: Make BUG message more legible by
a
d
ding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t
6022: Add testca
s
e for me
r
ging a rena
m
ed
f
i
le with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t602
2
: New t
e
sts
c
hecking for unnecessar
y
up
d
ates of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022
:
Remove unnecessary untracked files to make test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
Newre
n
t6
0
36: cr
i
s
s
-cros
s
+
rename/rename(1to
2
)/a
d
d-source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6036: criss-cros
s
w/ re
n
ame/rename(1to2
)
/mo
d
ify+rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: tests for cri
s
s-cr
o
ss
m
erges w
i
th various
d
irectory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
t6036: criss-cross w
i
th weird content
can fool gi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6
0
36: Add differently res
o
l
v
ed modify/delete conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add
faili
n
g tes
t
c
a
s
e
s for rename/ren
a
me/add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6042: Ensure rename/r
e
name conf
l
i
c
ts
l
eave
i
nd
e
x and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah N
e
wren
t6042: Ad
d
test
s
for co
n
te
n
t issues with mo
d
ify/rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042
:
Add a
t
e
st
c
a
se w
h
ere
u
ndetected rename causes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t60
4
2: Add
a
pair of cases
w
here undetected renames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6042: Add failing testcase
f
or
r
ename/modify/add-sour
c
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
ren
t
6
042: Add
a testcase where git deletes a
n
u
n
t
r
acked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
J
i
m Meyering
fetch: do not leak 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
H
amano
Merge
b
ranch
'jk
/
maint-config-alias-f
i
x'
int
o
maint
commit
|
commitdiff
|
tree
2011-06-01
J
u
nio
C
H
a
m
ano
Merge
b
r
a
nch 'jc/fmt-req
-
fix'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-06-01
J
unio C Hamano
M
e
rg
e
branc
h
'jk/maint-docs' into main
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C
H
amano
Merg
e
branch 'jn/
d
oc-remote-hel
p
ers' int
o
maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch 'k
k
/maint-pr
e
fi
x
-in-c
o
nfig-
m
a
k
' into maint
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyerin
g
diffcore-r
e
n
a
me
.
c: a
v
oid
s
et-but-not-u
s
ed warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Start
1
.
7
.
5
.
4
d
raft
r
elease n
o
tes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
J
unio
C
Haman
o
Merge
b
ranch 'tr/
a
dd-
i
-no-esca
p
e' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
n
io
C
Hamano
Merge bra
n
ch 'vh/config-inter
a
ctive-si
n
glek
e
y-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch 'ml/te
s
t-r
e
a
dme' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Mer
g
e b
r
anch 'ab
/
i18n-fixup' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Me
r
ge bra
n
c
h
'
jc/renam
e
-degrade-cc-t
o
-
c' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
ni
o
C
Ham
a
no
Merg
e
bran
c
h 'r
r
/d
o
c-con
t
ent-type' into m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Nieder
Documentati
o
n
: do no
t
misinterpr
e
t refspecs as
bold
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io C Hamano
Merge branch 'jm/maint-misc-fix' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-30
J
u
n
io
C Hama
n
o
Merge b
r
a
nch 'bc/main
t
-subm
o
dule-f
i
x-parked' into m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch 'bc/maint-a
p
i-
d
oc-park
e
d'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch
'
jn/
r
un-comm
a
nd-error-failure' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-27
Junio
C Hamano
conf
i
g
.
mak
.
in: allo
w
"configu
r
e
-
-sys
c
onfdir=/else
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff
K
ing
docs:
fix
s
ome
anti
q
ue example out
p
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Kin
g
docs: make sur
e
literal "->
"
isn't converted to arrow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: update status
-
-porcelain f
o
rmat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
docs
:
minor gramm
a
r f
i
xes to gi
t
-
s
ta
t
us
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Casey
git-sub
m
odule
.
sh: separa
t
e pare
n
s by a
space t
o
av
o
id
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brand
o
n
C
ase
y
Documentation/technical/api
-
diff
.
t
x
t
: correct
name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_g
i
tfile
_
gen
t
ly:
u
s
e ssize_t
to hold read r
e
sult
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Ji
m
M
e
y
e
r
ing
remove tests
o
f
always-f
a
ls
e
c
o
ndi
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim
M
eyering
rerere
.
c
:
d
iagno
s
e a
corrupt MERGE_RR when hitti
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio
C
Hamano
Git 1
.
7
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Ham
a
no
Merge branch 'main
t
-1
.
7
.
4' into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
M
e
rge bran
c
h 'jk/git-
c
onnection-deadlock
-
f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
i
o
C H
a
mano
Merge br
a
nch 'js/m
a
int-send
-
pack-statele
s
s
-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C
Hama
n
o
Merge bran
c
h 'jk/maint-upl
o
ad
-
pack-sh
a
llow' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge branch 'jm/maint-diff-words-with-sbe'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
i
o
C Hama
n
o
Merge
b
ranch '
k
k/maint-prefix-in
-
co
n
fig-
m
ak'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Haman
o
Merge branch 'm
g
/di
f
f-uiconf
i
g-do
c
' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Ham
a
no
Merge branch '
f
t/git
w
eb-
t
ar-with-gzip-n' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C Hamano
Merge bra
n
ch 'ss/doc-sv
n
' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
M
erg
e
branc
h
'jn/format-patch-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Merge branc
h
'
j
c/maint-pathspec-stdin-a
n
d
-
cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Me
r
g
e br
a
nc
h
'
jk/cher
r
y-
p
i
c
k-root-with-
r
esolve' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
M
e
rge branch 'rg/cop
y
-gecos-us
e
rname' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
aman
o
Me
r
ge branch 'f
c
/
c
ompletion-zsh' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge b
r
anc
h
'jk/git-connection-de
a
dlock-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C Hamano
M
e
r
ge br
a
nch '
j
s/
m
aint-sen
d
-pack-stateless-
r
pc-dead
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Me
r
ge
b
ranch 's
v
n-fe-mai
n
t
' of git://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
J
u
nio C Haman
o
us
e
rforma
t
_
f
ind_req
u
i
rements()
:
find r
e
q
u
irem
e
nt for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Thai Ngo
c
Duy
i
nit/
c
lone:
remove short optio
n
-
L
a
nd document --separat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Junio C
H
am
a
no
han
d
l
e_op
t
ion
s
(
): do not misc
o
unt how many a
r
guments
.
.
.
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 King
config: always
p
arse G
I
T
_
C
O
NFIG_PARA
M
ETERS
d
uring git_c
o
nfig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff
King
git_config: d
o
n't p
e
ek at globa
l
config_param
e
ter
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config: make
environment
par
s
i
ng
routines static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jim M
e
y
e
r
i
n
g
do not read
b
eyond end of malloc'd buf
f
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
M
ich
a
el J Gr
u
ber
git-
s
vn: Fix git svn log
-
-show-commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Gi
t
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nied
e
r
p
rovide a copy of th
e
LGPLv
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitp
r
oxy configuratio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Rafael Giesc
h
k
e
copy_gecos: fix not
a
d
d
ing nl
e
n
to
l
en when pr
o
c
e
s
s
ing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Thomas Ra
s
t
ad
d
-i: ignor
e
t
e
rmin
a
l
es
c
ap
e
sequ
e
nc
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio C
Hamano
Me
r
g
e branch 'js/maint-1
.
6
.
6-s
e
n
d-pa
c
k-s
t
ateles
s
-
rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
Hamano
Update draft release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
a
mano
Merge
b
ranch 'jn/m
a
int-
f
ormat
-
p
a
tch
-
doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge branch 'ss/cherry
-
pick
-
x-doc'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
H
amano
Merge bran
c
h 'vr/
m
erge
-
b
a
s
e-doc' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ra
n
ch 'sr/maint
-
fas
t
-import-tighten-option-p
a
r
sing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branch 'jc/t1506-sh
e
ll
-
param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
n
o
Merge branch 'jc/fix-add-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hama
n
o
Merge bra
n
c
h
'jn/gitweb
-
dependency'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
ama
n
o
Merge bran
c
h '
j
c
/
m
aint-branch-mergeoptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge branch 'jc/
m
aint-add-p-overlapping-h
u
nks'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Documen
t
ation/
g
it-fsck
.
t
x
t: fix ty
p
o
: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
send-pack: avoid deadlo
c
k
on
g
it://
push with fail
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff
K
ing
connect: let callers know if con
n
ection
is a socket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
eff
K
i
ng
connec
t
:
treat generic
p
roxy p
r
oc
e
sse
s
like ss
h
processes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next