repo.or.cz
/
git.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 recursive case with D/F conflict via add/add conflict
2011-08-14
Elijah Newren
merge-re
c
ursive: F
i
x recursive cas
e
with D/F co
n
fl
i
ct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newre
n
merge-rec
u
rsive:
A
void wor
k
ing directo
r
y c
h
anges during
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
ren
me
r
g
e
-recursive: Remember
to free genera
t
ed uni
q
ue
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merg
e
-recursive
:
Consolidat
e
different update_stages
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge
-
recu
r
s
ive: Mark
some diff_files
p
ec struct argume
n
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-recursive:
Correct
a c
o
mme
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recurs
i
v
e
:
M
a
ke
BUG m
e
ssage more
l
egible by a
d
ding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t
6022: Add
testcase f
o
r
m
e
rging a renamed f
i
le
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
t
6
022: New t
e
sts c
h
e
c
king for unn
e
c
essary updates of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6022: Remo
v
e unnecessa
r
y u
n
t
r
acked
f
i
les to ma
k
e test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t
6036: cr
i
ss-cro
s
s +
rena
m
e/rename(
1
to2)/add-s
o
urce
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: cri
s
s
-c
r
oss w/ rename
/
rename(1to2)/mo
d
ify+r
e
name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6036:
t
ests for c
r
iss-cross merges with var
i
o
u
s direct
o
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
t6036: cr
i
ss-cross with weird content c
a
n fool gi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
e
wren
t
6036: Add differ
e
ntly resolved modify/delete confl
i
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
042: Add failing
testcases fo
r
rename/re
n
a
m
e/
a
dd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t60
4
2: Ensure ren
a
m
e
/rename
c
onflicts leave index and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t604
2
: Add tests
for con
t
ent is
s
ues w
i
th modif
y
/rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Ne
w
ren
t6042: A
d
d a testcase wh
e
re undetected
r
ename causes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h
New
r
en
t6042: Add a pair of cases where und
e
t
e
cted renames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6042: Ad
d
f
a
i
lin
g
testca
s
e for r
e
name/modify/add-so
u
r
c
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ew
r
en
t6042:
A
dd a test
c
ase where git deletes
a
n
u
ntracked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
Ji
m
M
eyering
fetch: do not
l
eak a refspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o C
Haman
o
Git 1
.
7
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch 'jk/ma
i
n
t
-config-alias-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
M
erge br
a
nch
'
jc/fm
t
-req-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
io
C Hamano
Merge branch 'jk/main
t
-
docs' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C H
a
mano
Merge branch 'jn/do
c
-
r
em
o
te-
h
elp
e
rs' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-06-01
J
u
n
i
o C Hamano
M
er
g
e branch 'kk/maint-prefix-in-config-mak' into maint
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyering
dif
f
core-r
e
n
a
m
e
.
c: avo
i
d set-but-
n
ot-used w
a
rning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Start 1
.
7
.
5
.
4 draft
r
e
l
ease notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branc
h
'tr/a
d
d-i-no-esca
p
e'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-31
J
unio C Ha
m
ano
Merge branch 'vh/con
f
ig-inter
a
cti
v
e
-
sing
l
ekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
J
u
n
i
o C Hamano
Me
r
ge branch 'ml/test-readme' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch 'ab/i18n-fi
x
up' into maint
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
Merge
b
ranch
'
j
c
/rename-degrade-cc-t
o
-c' int
o
maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
M
e
r
ge br
a
n
c
h 'r
r
/do
c
-content-type' int
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Jona
t
han Nieder
D
o
c
umentatio
n
: do
no
t
misint
e
rp
r
et refsp
e
cs as
bo
l
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merg
e
bra
n
c
h 'jm/
m
aint-
m
isc-fix' int
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Junio
C Hamano
Merge branch 'bc/main
t
-submodule-f
i
x-parked'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Hamano
Merge b
r
anch 'bc/m
a
int-api-doc-
p
arked'
into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge b
r
a
n
ch
'j
n
/run-command-er
r
or-fai
l
ure'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
c
o
nfig
.
m
a
k
.
in: al
l
ow "
c
onfigure --sysconfd
i
r
=
/else
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff King
doc
s
: fix som
e
antique example output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
d
ocs: make sure li
t
era
l
"->" isn'
t
c
on
v
erted to arrow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
doc
s
: update statu
s
--porc
e
lain f
o
rmat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
d
ocs: minor gramm
a
r
fixes
to g
i
t
-
status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Bra
n
don Case
y
git-s
u
bmodule
.
sh: separate parens by
a
sp
a
ce
to avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Bra
n
d
o
n
Casey
D
o
cumentation/technical/api-diff
.
txt: correct name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
King
read_g
i
tfi
l
e_
g
ently:
u
se ssize_
t
t
o
hold
read r
e
sult
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
remov
e
tests of
al
w
ays-false condition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Mey
e
ring
rerere
.
c: dia
g
nos
e
a co
r
rupt M
E
R
G
E_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 Hamano
M
e
rge branc
h
'm
a
int-1
.
7
.
4
' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Ham
a
n
o
Merge branch 'jk/
g
i
t
-connection-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge bran
c
h '
j
s/maint-send-p
a
ck-stateless
-
rpc-deadloc
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
M
erge branc
h
'jk/main
t
-upload-
p
ack-sh
a
llow
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
io C
Hamano
Merge bra
n
ch 'jm/m
a
in
t
-diff-words-with-sbe'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge br
a
nch 'kk/maint-prefix-in-config-
m
ak' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch
'
mg/d
i
ff
-
uiconfig-do
c
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Merge branch 'ft/gitweb-tar-with-gzip-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Me
r
ge br
a
n
ch
'
ss/doc-sv
n
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C Hamano
Merge bra
n
ch
'
jn/format-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Haman
o
Merge branch 'jc/maint-pathspec-std
i
n-and-
c
m
dline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Ha
m
ano
Merge
b
ranch '
j
k
/
cherry-pick-root-with-reso
l
v
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'rg/copy-
g
ecos-user
n
ame' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
J
un
i
o C Haman
o
Merge b
r
an
c
h 'fc
/
completion-z
s
h' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C H
a
mano
Mer
g
e br
a
nc
h
'jk/git-connection-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Ham
a
no
M
er
g
e
bra
n
ch 'js/maint-send-pack-st
a
teless-
r
pc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Mer
g
e bran
c
h
'svn
-
fe-maint' of git://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Ju
n
io
C
Haman
o
userformat_find_requirements(): fin
d
re
q
u
i
remen
t
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-25
Ng
u
yen Thai Ngoc Duy
init/clon
e
: remove short option -L and document --separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Junio C Hama
n
o
handle_opti
o
ns(
)
: do not m
i
scount how ma
n
y
a
r
g
u
m
ents
.
.
.
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
c
onfig: always par
s
e GIT_CONFIG_PARAMET
E
RS during git_
c
onfig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff K
i
ng
git_
c
o
n
fig:
don't peek a
t
glob
a
l
config_p
a
rameters
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
c
onfig:
m
ake envir
o
nment parsi
n
g
routi
n
es static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jim Meyering
d
o not read beyon
d
end of mallo
c
'd buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Mi
c
h
a
e
l J Gruber
git-svn: Fi
x
git svn lo
g
--
s
how-commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Git
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
pr
o
vide a copy
o
f the L
G
PLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff Ki
n
g
test core
.
gitproxy configurati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Ra
f
ael Gi
e
schke
copy
_
gecos:
fix not add
i
n
g nle
n
to len when processing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
T
h
omas Rast
add -i: i
g
nore
t
ermina
l
es
c
ape sequences
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merge branch 'js
/
maint-1
.
6
.
6-send-p
a
ck-statel
e
ss
-
r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Update draft relea
s
e notes
t
o 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Haman
o
Mer
g
e branc
h
'j
n
/maint-for
m
at-pat
c
h
-
doc' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ha
m
ano
Merge b
r
anch 'ss/cherry
-
pick-
x
-
d
oc
'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
M
e
rge branch '
v
r/mer
g
e-base-doc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Merg
e
branch 'sr
/
maint-fast-import-tighten-o
p
tion-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Me
r
g
e
b
ranch 'jc/t1506-shell-param-e
x
pansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
Hamano
M
e
rge branch 'jc/f
i
x-add
-
u-unmerged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
n
o
Merge b
r
anch 'jn/gitweb-dependency' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch 'jc/
m
aint-branch-mergeopti
o
ns' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/
m
aint-add-p-o
v
er
l
appin
g
-
hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
im Meye
r
i
n
g
Do
c
u
mentation/git-fsck
.
txt:
fix t
y
po: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
s
end-pack: avoid
d
e
a
dlock on git:// push wi
t
h
f
ai
l
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f King
connect: let caller
s
know
if
connection
i
s a s
o
cket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
ing
connect: treat generic proxy processes l
i
ke ssh processes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C H
a
mano
side
b
and_de
m
ux(): fix dec
l
-afte
r
-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503: test
cherry pickin
g
and r
e
ve
r
ting root commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next