repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
string-list: Add API to remove an item from an unsorted list
2011-08-14
J
o
han
n
e
s
Sixt
string-l
i
st: A
d
d API to r
e
mov
e
an i
t
em from a
n
u
n
so
r
t
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewren
merge-recursive: S
p
lit was_tracked()
out of would_lo
s
e_unt
r
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge
-
recursive: Save D/F conflict
filen
a
mes instead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewren
merge
-
r
ec
u
rsive
:
Fix
c
o
d
e checking for D/F conflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-rec
u
rsive: Fix sorting o
r
de
r
a
nd directory 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
merg
e
-recursive: Fix recursiv
e
c
a
se with
D/F conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah New
r
en
merge-recursive: Avoi
d
wo
r
king dire
c
tory
c
h
anges
duri
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-
r
ecurs
i
ve: Reme
m
ber to free generated unique
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recurs
i
v
e
:
Consolidate differ
e
nt upda
t
e
_
s
tages
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-r
e
cursiv
e
: Mark
s
ome di
f
f_file
s
p
e
c
struct arguments
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-rec
u
rsive: Correct a comme
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
me
r
ge-recursive: Ma
k
e BUG message mor
e
legibl
e
b
y
adding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
r
en
t6022: Ad
d
tes
t
case for
merging a renamed
f
ile wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: New te
s
ts checking for
u
n
nec
e
ssary u
p
dates of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t60
2
2
: Remove unne
c
essar
y
untrac
k
ed files to
m
a
k
e test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t603
6
: cri
s
s
-cross +
r
e
name/ren
a
me
(
1to2)/add-source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newr
e
n
t6036: criss-cross
w
/
r
en
a
me/rename(1
t
o2)
/
m
o
d
ify+r
e
n
ame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wre
n
t6
0
36: tests for cris
s
-
c
ross merges with v
a
rious
director
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6036: criss-cross w
i
th w
e
ird con
t
ent can fool git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6036: Add differently resolved modify/d
e
lete conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
4
2
:
Add
failing testcases for
re
n
ame/re
n
a
m
e/a
d
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
t6042: Ensu
r
e
rename/
r
en
a
m
e
c
o
nflicts leav
e
index and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t
6042: Add
t
est
s
for c
o
nte
n
t i
s
sues
w
ith modify
/
rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
t6042: Add a test
c
a
s
e
where undet
e
cte
d
rename causes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6
0
42: Add
a
pair of cas
e
s wh
e
re
u
ndetect
e
d
renames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newre
n
t6042:
Add
f
ailing tes
t
case for ren
a
me/mo
d
ify/add
-
source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t
6
0
42: Add a tes
t
cas
e
where git deletes an untrac
k
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
Jim Me
y
ering
f
e
tch: do not lea
k
a refspe
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
J
un
i
o C Hamano
Git 1
.
7
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o C Hamano
Merge branch 'jk/maint
-
config-alias
-
fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C H
a
mano
M
e
rge
branch 'jc/fmt-req
-
f
i
x'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C H
a
m
a
no
Merge bra
n
ch 'jk
/
ma
i
nt-docs' into mai
n
t
commit
|
commitdiff
|
tree
2011-06-01
J
unio C Hamano
M
e
rge branch 'jn/doc-remote
-
helpers' into
m
a
int
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ham
a
no
Merge b
r
a
n
c
h 'kk
/
maint-prefix-in-
c
onfig-mak' into maint
commit
|
commitdiff
|
tree
2011-06-01
Jim M
e
y
e
r
ing
diffcore-re
n
a
m
e
.
c:
a
void set-but-not-used warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Hamano
S
t
art 1
.
7
.
5
.
4 draft
r
elease
notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
aman
o
Merge b
r
anch 't
r
/ad
d
-i
-
n
o-escape
'
into main
t
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io
C
Hamano
Merge
branch 'vh/config-i
n
teractive-singlekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
Merg
e
branch 'ml/t
e
s
t
-
r
eadme'
into maint
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o
C Hamano
Merge branch 'ab/i18n-
f
ixup'
i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge bra
n
ch 'jc/ren
a
me-degrade-c
c
-to-c'
into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Mer
g
e branch 'rr/
d
o
c
-c
o
ntent-type' into maint
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Nie
d
er
Docu
m
e
n
tation: do
n
ot mi
s
in
t
e
r
pret refspecs as
b
old
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Junio C H
a
mano
Merge br
a
nch 'jm/ma
i
nt-misc-
f
ix' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C
Ham
a
n
o
Merge
b
ra
n
ch 'bc/maint-submodule-fi
x
-parked' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch 'bc
/
maint-api-doc
-
pa
r
ked'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-30
J
u
nio C Ham
a
no
Merge branc
h
'jn
/
run-command-error-f
a
ilure'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-27
J
unio C Hamano
config
.
mak
.
in: allow
"con
f
igure
--sysconfdir=/
e
lse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
ng
docs: fix so
m
e antique exa
m
p
l
e
output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
J
e
f
f
K
ing
d
ocs
:
make sure li
t
eral "
-
>" isn
'
t converted to arrow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
King
docs:
u
pdate sta
t
us --porcelai
n
for
m
a
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Ki
n
g
d
o
c
s
: min
o
r gramma
r
fixes
t
o git-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brand
o
n
C
a
sey
git-
s
ubmod
u
le
.
sh:
s
epa
r
ate parens by a
s
pace to
av
o
i
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brando
n
C
asey
Documentation/tec
h
n
i
cal
/
a
pi-diff
.
t
x
t: corre
c
t name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
r
e
ad_gitfile_gently: use
s
si
z
e_t t
o
hold read result
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyeri
n
g
r
emo
v
e
t
e
sts of al
w
ays-false condition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meye
r
ing
rerere
.
c:
diag
n
ose a corrupt MERG
E
_
RR when hitting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Git
1
.
7
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
r
anch 'maint-1
.
7
.
4' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C
H
amano
M
e
rge branch
'j
k
/git-c
o
nnection-de
a
d
lock-fix' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge br
a
nch
'
j
s
/maint-send-pack-stateless-rpc-deadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Haman
o
Merge branch 'jk/m
a
int-upload-pack-shallow' int
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jm/mai
n
t-di
f
f-wo
r
d
s
-with-sbe' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
Merg
e
branc
h
'
k
k/maint
-
pr
e
fix-in-conf
i
g-mak' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
M
erge branch
'
mg/dif
f
-uiconfig-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
bra
n
ch 'ft/gitw
e
b-tar-w
i
th-gz
i
p-n'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o C H
a
m
a
no
M
e
rge branch
'
ss
/
d
o
c-svn' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e branch 'jn/format-pa
t
ch-doc' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge b
r
a
nch 'j
c
/maint-pat
h
s
p
e
c-stdin-a
n
d-cmdlin
e
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C
Ha
m
a
no
Merge branch 'jk
/
c
herry-pic
k
-root-with-resolve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merg
e
br
a
nch 'rg/c
o
py-gecos-username' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Ha
m
ano
M
e
rge
b
ra
n
c
h 'fc/completion-zsh
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
branch 'jk/git-connection-deadloc
k
-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hama
n
o
Merge
b
r
anch 'js/main
t
-send-pack-st
a
t
eless-rp
c
-dead
l
oc
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Me
r
ge bran
c
h
'sv
n
-
f
e-main
t
' of
g
i
t
:
/
/repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Ham
a
n
o
userformat_
f
ind_
r
equirements(): fin
d
requirement for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Tha
i
Ngoc Duy
init/clon
e
: r
e
move short op
t
i
o
n
-L and document
--separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
J
u
nio C Hamano
handle_options(): do not miscou
n
t how
m
any 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
Jeff King
co
n
fig: a
l
ways parse GIT_C
O
NFIG_PARAME
T
ERS during git_c
o
n
fig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff K
i
ng
g
i
t_config: don't peek at global config_paramete
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
J
eff Kin
g
config: make env
i
r
onment parsing routines static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jim Meyering
do
not
r
ead beyond
end of malloc'd
b
uffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gruber
git-svn: Fix git
s
v
n
l
og --s
h
ow-
c
o
m
mit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
m
a
n
o
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jo
n
athan Nieder
provide a cop
y
of the LGPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Je
f
f
K
i
ng
test core
.
gitproxy configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
R
a
f
a
e
l
Gieschke
copy_gecos: fix not adding nlen to len when proces
s
ing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Thomas Rast
add -i:
ign
o
r
e
t
e
r
minal escap
e
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
ack
-
stateless-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Update draft release n
o
t
e
s
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Haman
o
M
erge branch 'jn/main
t
-f
o
rmat-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch
'
ss/cherry-pi
c
k
-
x-doc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
H
a
mano
Merge branch 'vr/merge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
s
r
/maint-
f
ast-import-tighten-option-par
s
ing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge b
r
anch 'jc/t1506-shell-param-expansion-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C
H
amano
M
e
rge branc
h
'jc
/
f
i
x
-
add-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch 'jn/gitweb-d
e
pendenc
y
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
m
a
no
Merge branch 'jc/main
t
-branch-mergeoptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge b
r
anch '
j
c/ma
i
nt-add-p
-
over
l
appi
n
g-hun
k
s' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ji
m
Meyering
D
o
cumentation/git-fsc
k
.
txt: fix typo: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next