repo.or.cz
/
git
/
mingw
/
j6t.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
Johannes Sixt
st
r
ing-list: Add API to remove
a
n item from an unsorte
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive: Split was
_
tra
c
ked() out of would_l
o
se_untra
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
me
r
g
e-rec
u
r
si
v
e: S
a
ve
D/F
c
onf
l
i
ct f
i
lenames inste
a
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursiv
e
: F
i
x code checking for D
/
F co
n
flicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recursiv
e
:
Fix sor
t
ing ord
e
r an
d
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
E
l
ijah Newren
merge-recursiv
e
: Fix recursive case
with D/F con
f
lict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Avoid
working directory changes durin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewren
merge-recur
s
ive:
Remember to free generated
unique
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
m
erge-recu
r
sive: Co
n
solidate differe
n
t
u
pd
a
te_stages
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
ewren
merge-re
c
ursive:
Ma
r
k s
o
me diff_filespec struct arg
u
ments
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
e
w
ren
merge-rec
u
rsive: C
o
r
r
ec
t
a comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah N
e
wre
n
merge-recursive: Make BUG
mes
s
age more legible by
adding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022
:
Add tes
t
ca
s
e for merging a renam
e
d fi
l
e with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t602
2
: New tests check
i
ng
f
or unnecessary
updates of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newren
t6022: Remove unnecess
a
ry u
n
tr
a
cked
f
iles to make test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newre
n
t6036: cri
s
s-cross +
r
ename/ren
a
me(1
t
o2)/a
d
d-source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6036: criss-c
r
oss w/
rename/rename(1to2)/m
o
dify+rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t
6036: tests for
c
riss
-
cross merges with various
direc
t
ory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Newren
t
6
0
36: cr
i
ss-cros
s
with weird content can fo
o
l g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
t6036: Add di
f
ferent
l
y resolved modify/delete c
o
nflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t
6042:
A
dd failing
t
est
c
ases
for r
e
name/
r
enam
e
/add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t60
4
2: Ensure re
n
a
m
e/rename
conflict
s
leave
i
nd
e
x and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Ne
w
ren
t6042: Add
test
s
for co
n
tent
i
s
s
ues wi
t
h modify/ren
a
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6042
:
Ad
d
a
testcase where undetected ren
a
me causes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t60
4
2: Add a pair of cases wher
e
undetect
e
d r
e
name
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t
6
0
4
2: Add failing
t
e
stcase for rename/mod
i
f
y
/add-source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6042: Add
a test
c
as
e
whe
r
e git d
e
lete
s
a
n
u
ntracke
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
Jim Meyerin
g
fetch:
do not leak a
refspe
c
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
Juni
o
C Hamano
Merge branch
'
jk/m
a
int-config-alias-fix' into main
t
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
i
o C Hamano
Merge bran
c
h
'jc/fmt
-
req-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C
Hamano
Merge b
r
a
nch 'jk/mai
n
t-docs' into
maint
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
io C
H
amano
Merge branch '
j
n/doc-remot
e
-he
l
pers
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-06-01
Junio C Haman
o
Merge branch 'kk/ma
i
n
t
-prefix-in-co
n
fig-mak
'
into m
a
int
commit
|
commitdiff
|
tree
2011-06-01
Jim Meye
r
i
n
g
dif
f
core-rena
m
e
.
c
:
a
v
oi
d
set-but
-
no
t
-
use
d
warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
J
unio C Hamano
S
t
art 1
.
7
.
5
.
4 draft release notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C
H
a
m
ano
M
erge
b
ranch 'tr/add-i-no-esc
a
pe
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
Me
r
ge br
a
n
ch 'vh/con
f
ig
-
i
n
teract
i
ve-singl
e
key-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch 'ml
/
test-
r
eadme' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branc
h
'
ab/i18n-fixup' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
n
io C Hamano
Merge branch 'jc/rename-degrade-cc-to-c' into maint
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Haman
o
Merge br
a
nch 'rr/doc-content
-
type' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Nied
e
r
Docu
m
e
n
tation:
d
o not mi
s
interpre
t
refs
p
ecs as bold
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Junio
C Hamano
Mer
g
e branch 'jm/maint
-
m
i
sc-fix' into m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Junio C H
a
mano
M
er
g
e
b
ranch 'bc/m
a
int-submodule
-
fix-
p
arked' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ha
m
ano
Merge branch 'bc/maint-api-doc-parked' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge bra
n
ch 'jn/run-co
m
man
d
-erro
r
-f
a
ilure' into maint
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
config
.
mak
.
in
:
allow "configur
e
--sysc
o
nfdir=/else
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
King
d
o
cs
:
fi
x
some an
t
i
q
ue ex
a
mple out
p
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
ng
do
c
s: make sure
l
i
t
e
ra
l
"->"
isn't c
o
nverte
d
t
o
arrow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
King
doc
s
: up
d
ate status --porcelain for
m
at
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Kin
g
doc
s
: minor grammar fi
x
es to
g
it-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
B
r
an
d
on C
a
sey
git-submodule
.
s
h: se
p
ar
a
t
e
pa
r
ens
b
y
a
space to avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Casey
Documentation
/
t
e
chn
i
cal/a
p
i
-
diff
.
txt: c
o
rrect name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff K
i
ng
read_gitfile_gently:
use ssize_t to hold re
a
d re
s
ult
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
remove
tes
t
s of alw
a
ys-f
a
lse condition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
re
r
e
r
e
.
c:
d
iagno
s
e a corrupt MERGE_RR
when 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
Junio C
Hamano
Merge bra
n
ch 'maint-1
.
7
.
4' into maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Mer
g
e
b
ranch 'jk/git-conne
c
tion-deadlock
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
M
e
rge
b
r
a
nch
'
js/maint-send-pack-
s
tateless-rpc
-
dead
l
o
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Merge branch 'jk/m
a
int-up
l
oad-pa
c
k-shal
l
ow
'
i
nto
maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Mer
g
e branch
'
j
m/maint-diff
-
wor
d
s-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
-
i
n-co
n
fig-
m
ak' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branch 'mg/diff-uiconfig-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C H
a
mano
M
e
rge branch 'ft
/
gi
t
w
e
b
-t
a
r-with-gz
i
p
-n
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge bra
n
ch
'
ss/doc
-
svn' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
n
o
Merg
e
b
r
an
c
h 'j
n
/format
-
pa
t
ch-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hama
n
o
Mer
g
e b
r
anch 'jc/maint-pathspec-stdin-
a
nd-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch
'
jk/cherry
-
p
ick-root-with-resolve' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
b
ranch 'rg/cop
y
-gecos-u
s
ername'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o C Hamano
Merge
br
a
n
c
h 'f
c
/completi
o
n-zsh' into main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bran
c
h 'jk/git-connec
t
ion-dea
d
lock-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
io C Ha
m
ano
M
e
rge branch
'
j
s
/mai
n
t
-send-pac
k
-statel
e
ss-rpc-de
a
d
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge
b
ranch 'sv
n
-fe-
m
aint' of git://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Jun
i
o
C Hamano
userfo
r
mat_f
i
nd_
r
equ
i
rements(
)
: find r
e
quire
m
ent for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Thai Ngoc Duy
init
/
clone:
r
e
move sho
r
t option -L and
docu
m
ent --separ
a
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Ju
n
io C H
a
mano
handle_options(): do
n
ot mi
s
count how many
arg
u
ments
.
.
.
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
conf
i
g: always parse GIT_CONFIG_PARAM
E
T
ERS d
u
ring git_co
n
fig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
J
eff
K
i
ng
git_
c
onfig: don'
t
peek at glob
a
l config_parameters
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Je
f
f King
config: make
e
n
vironm
e
nt parsi
n
g
r
outines static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
im Meyering
do not read beyond en
d
o
f
m
a
lloc'
d
buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gruber
git-svn: Fix git
svn
l
og --sh
o
w-commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Hamano
Git
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jo
n
atha
n
Nieder
prov
i
de a co
p
y of the LGPL
v
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff K
i
ng
test c
o
re
.
gitproxy
c
onfiguration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Raf
a
el
Gieschke
copy_gecos: f
i
x not adding nlen to
l
en w
h
en proces
s
ing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Thomas
R
a
st
a
dd -i:
i
gnor
e
terminal escape sequences
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Jun
i
o C Hamano
M
e
rge branch 'js/main
t
-1
.
6
.
6-send-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Hamano
Upd
a
te
d
raft
r
el
e
a
s
e not
e
s to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
H
am
a
no
M
e
rge branch 'jn/maint-format-patch-doc
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge branc
h
'
s
s/cherry-pi
c
k-
x
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge bra
n
ch
'vr/me
r
ge-base-doc
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Ha
m
a
n
o
M
e
rge bra
n
c
h 'sr/maint-fast-im
p
ort
-
tighte
n
-
option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hama
n
o
Merge branch 'jc/t1506-shell-
p
aram-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hama
n
o
Merg
e
branch 'jc/fix
-
add-u-unmerged' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
r
ge branch
'jn
/
gitweb-depende
n
cy
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Ha
m
a
n
o
Me
r
ge
branch 'jc
/
maint-branch-
m
erg
e
op
t
i
o
ns' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Mer
g
e branc
h
'jc/maint-add-p-overla
p
p
i
n
g
-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyerin
g
Documentati
o
n
/
g
i
t-fsck
.
txt: fix
typ
o
: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next