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: Avoid working directory changes during recursive case
2011-08-14
El
i
jah
N
ewren
m
e
rge-r
e
cursive: Avoid
w
orking directo
r
y changes dur
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
m
e
rge
-
recursiv
e
: Rememb
e
r
t
o free
generated unique
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e: Consolidate different update_stages
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h Newren
merg
e
-r
e
cursiv
e
: Mark som
e
diff_filespec struct arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursiv
e
: Correct a commen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive
:
Make BUG message more legible
b
y add
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6022:
Add testcase
fo
r
m
e
rgi
n
g a renamed file with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t602
2
: New tes
t
s checking for unnecessary updates of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
t
6
022
:
Remove unnecessar
y
untracked
files t
o
make test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6
0
36:
c
riss-cross +
renam
e
/
rename
(
1to2)/add-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6036: criss-cross w/ r
e
name/rename
(
1
t
o
2
)
/m
o
dif
y
+r
e
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6036: tests
for criss-cros
s
merges with various directo
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6036: criss-
c
ross with weird cont
e
nt can fool git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newren
t603
6
: Add dif
f
erently resolved m
o
d
i
fy/delete conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
re
n
t
6
042: Add fai
l
ing
testcases fo
r
r
enam
e
/renam
e
/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042:
Ensur
e
re
n
ame/rename
c
onflicts leave
i
nd
e
x and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t604
2
:
Add tests
f
or co
n
tent issues wit
h
modify/
r
ename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6042: Add
a
testcas
e
where
undetec
t
e
d re
n
a
me caus
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add
a pair
of cases wh
e
re undetected renames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6
0
42: Add
failin
g
test
c
a
s
e for
rename/modify/add-sou
r
ce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6042: Add a test
c
ase where
g
it delet
e
s an u
n
tr
a
cked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim Me
y
ering
fetch: do not l
e
ak
a
r
e
fspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C Ha
m
ano
Git 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
J
unio
C Hamano
Merge bra
n
c
h
'jk/maint-co
n
f
i
g-alias-fix' i
n
to
maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merg
e
branc
h
'jc/fmt-req-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
u
ni
o
C Ha
m
ano
Merge branc
h
'j
k
/maint-
d
ocs' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
a
n
o
M
e
rge branch 'jn/doc-
r
emote-helpers' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge
bran
c
h 'kk/m
a
int-prefix
-
i
n
-
config
-
mak' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-06-01
J
i
m M
e
yer
i
n
g
diffcore-rename
.
c:
a
void s
e
t-but-no
t
-used warnin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
J
unio C Hamano
Start 1
.
7
.
5
.
4
dr
a
f
t
release
n
otes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
M
e
rge
b
ranch
'tr/add-i-no-escape' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Merge
b
ranch 'vh/config-in
t
erac
t
ive-si
n
glekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Ha
m
ano
Mer
g
e branc
h
'
m
l/test-
r
eadme' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C Hamano
Merge b
r
a
nch 'ab/i18
n
-fixup' into main
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
ano
M
e
rg
e
branch
'jc/ren
a
m
e
-degrade-cc-to
-
c
'
into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Haman
o
Merge branch 'rr
/
doc-
c
o
n
tent-t
y
pe' into maint
commit
|
commitdiff
|
tree
2011-05-30
J
onathan N
i
eder
Do
c
umentation:
do not misinterpr
e
t refspecs as
b
old
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ham
a
no
Merge branc
h
'jm
/
maint-misc-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-05-30
J
u
nio C
H
amano
Merge
b
ranch 'bc/maint-submodule-f
i
x-par
k
e
d
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Junio C H
a
mano
Merge
b
ran
c
h 'bc/maint-api-doc-parked' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
M
e
rge branch 'jn/run-comman
d
-
error-failure' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-27
Juni
o
C
H
ama
n
o
co
n
fig
.
mak
.
in: allow
"configure --syscon
f
dir=/else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
King
docs:
f
ix some anti
q
ue example outpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
d
oc
s
: ma
k
e s
u
r
e
literal "->" isn't con
v
ert
e
d to arrow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
J
e
f
f
K
i
n
g
doc
s
:
up
d
ate status --porcelain
f
o
r
m
at
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Ki
n
g
docs: minor
grammar fixes to git-
s
tatus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Bra
n
d
on
C
asey
git-subm
o
dule
.
s
h
: separate parens
b
y
a space t
o
avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon
C
asey
Documentation/technica
l
/
a
p
i-di
f
f
.
txt:
c
o
r
rect nam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_gitfile_gently: u
s
e ss
i
ze_t t
o
ho
l
d read re
s
ult
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyer
i
n
g
re
m
ove t
e
sts of always-fal
s
e condition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim
Me
y
ering
rerere
.
c:
diagnos
e
a
corrupt
MERGE_RR
w
h
en hitting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C
Hama
n
o
Me
r
ge branch 'maint-1
.
7
.
4' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Ham
a
no
Merge
b
r
a
n
c
h
'jk/git-conne
c
tion-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
i
o
C
Haman
o
M
e
rge branch
'js/maint-send-pack-sta
t
eless-rpc-de
a
dl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C Hamano
Merge
branch 'jk/maint-upload-pac
k
-
s
hallow' into
maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C
Haman
o
M
e
rge
b
ran
c
h 'jm/maint-diff-words-with-sbe' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
uni
o
C Hamano
M
erge
b
ranch '
k
k
/
ma
i
nt-prefix-in-conf
i
g-mak' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge branch 'mg/d
i
ff-uicon
f
ig
-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Ha
m
ano
Merge bra
n
ch
'
ft
/
gitweb-ta
r
-
with-gzip-n' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
ranch 'ss/
d
oc-svn
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge branch '
j
n/form
a
t
-
patch-do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
M
erge branch 'jc/mai
n
t
-
pathspec
-
stdin-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branch 'jk/cherry-pick-ro
o
t-wit
h
-re
s
o
l
v
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge bra
n
ch '
r
g/c
o
py-gecos-username'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Ha
m
ano
Merge b
r
a
nch 'fc
/
completi
o
n
-zsh'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bra
n
ch '
j
k/git-connection-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Mer
g
e
bra
n
ch 'js/maint
-
send-pack-
s
tateless-rpc-dea
d
lock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio
C Hamano
Merge br
a
nch 'svn-fe-maint
'
of git://r
e
po
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Juni
o
C
Hamano
userformat_find_requirements():
find
r
equirement for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen
T
hai Ng
o
c Duy
init/clone
:
re
m
ov
e
sh
o
rt option
-L and d
o
cument --separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio C Hamano
handle_options(): do not miscou
n
t how many argument
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
J
eff K
i
ng
config:
a
lway
s
parse GIT_CONFIG_PARAMETERS dur
i
n
g
g
i
t_con
f
ig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
J
eff King
gi
t
_
config: don't pe
e
k at g
l
ob
a
l config_pa
r
ameters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config: make en
v
ironmen
t
pars
i
n
g routines
s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jim Meye
r
i
n
g
do not read bey
o
n
d
e
n
d
o
f malloc'd buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gruber
git-
s
vn: Fix git svn log --show-commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io
C
Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Ni
e
der
provide
a cop
y
of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
t
e
s
t core
.
g
itproxy
c
o
nf
i
guration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Rafa
e
l
Gie
s
chk
e
co
p
y
_
g
ecos: fix
n
ot adding nl
e
n
to len whe
n
p
r
ocessi
n
g "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
T
homas
R
ast
add -i:
i
gno
r
e terminal
escape
s
eq
u
e
nce
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
unio C Hamano
Merge branch
'js/
m
aint-1
.
6
.
6-send-pack-
s
tate
l
ess-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update draf
t
release note
s
t
o 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge br
a
nc
h
'jn/m
a
int-format-patc
h
-doc'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rg
e
branch 'ss/cherry-pick-x-d
o
c'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
M
erge branch
'
v
r/merge-ba
s
e-doc' into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
ma
n
o
Me
r
ge branch 'sr/maint-fast-import
-
tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge branch 'jc/t1506-shell-
p
aram-expansion-go
t
c
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C Ham
a
no
Merge
branch '
j
c/fix-ad
d
-u-unmerged' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hama
n
o
Merge branch 'jn/gitweb-
d
ep
e
nde
n
cy' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/maint-branch-mergeo
p
tio
n
s'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
jc
/
maint-add-p-overlapping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Doc
u
men
t
ation/git-fsck
.
txt: fix
t
y
p
o: unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
send-pack: avoid deadlock
on gi
t
://
p
ush with failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect: let call
e
rs kn
o
w i
f
conne
c
tion
i
s a soc
k
e
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
connect
:
tr
e
at generic proxy proc
e
sses like ssh processes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideband
_
d
e
mux(): fix d
e
cl
-
after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t
3
503
:
test cherry picking and
reverti
n
g roo
t
com
m
its
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert:
allow
r
eve
r
ting a root com
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next