repo.or.cz
/
git
/
dscho.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
hannes
S
i
xt
strin
g
-l
i
st:
A
dd
A
P
I
to remove an item fr
o
m
a
n un
s
o
rted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Ne
w
re
n
merge-recursiv
e
:
Split
was_tracked()
out of
w
o
u
l
d_lose_untra
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
a
h Ne
w
ren
mer
g
e-recursive:
S
ave D/F
conflict filenames
i
nstea
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newre
n
merge-recursive: Fix cod
e
checki
n
g for D
/
F conflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
g
e-recu
r
s
i
ve: F
i
x sorting
o
r
d
er and direct
o
ry 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 Newr
e
n
merge
-
recursive: Fix recursive case
with D/F conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h New
r
en
me
r
ge-recursiv
e
: A
v
oid
w
orking dire
c
tory
c
h
a
n
g
es during
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
merge-recursive
:
Remember
t
o
free generate
d
unique
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recu
r
sive: Consolidate d
i
fferent upda
t
e
_
stage
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newre
n
merge-recursive:
Mark some di
f
f_filespec str
u
ct arg
u
ments
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-r
e
cu
r
si
v
e
: C
o
rrect a
com
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merg
e
-recursive:
Make B
U
G m
e
ssage
more leg
i
ble
b
y
adding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Add
tes
t
case
for
m
erging a rename
d
file with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
2
2:
N
e
w
test
s
checking for unnecessary updat
e
s of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6022:
R
emove unnecessa
r
y untra
c
k
e
d files to make test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
ren
t60
3
6: criss-c
r
oss +
rename/rename(1to2)/add-sourc
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6036: cr
i
s
s
-cross w
/
rename/r
e
name(1to2)/modify+rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6036: tests fo
r
criss-cross mer
g
es with various directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h
N
ewren
t6036: criss-cross w
i
th weird con
t
ent
c
an
fool
g
it
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t
6
036:
A
d
d dif
f
erently resolved modify/delete
conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
42: Ad
d
failing testcas
e
s for rename/rename/add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t
6
0
42: Ensure
r
ename/rena
m
e c
o
nflicts
leave index a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah New
r
en
t6042:
Add tests for conte
n
t
is
s
u
e
s with modif
y
/rena
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t604
2
:
A
d
d a tes
t
case where un
d
e
t
e
cted rename c
a
uses
.
.
.
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 pai
r
of cases where un
d
e
t
ecte
d
r
e
names
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newr
e
n
t6042: A
d
d f
a
ilin
g
t
estca
s
e
for rename/mod
i
fy/add
-
source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6
0
42: Add
a testcas
e
where git deletes an untracked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
Jim Meyer
i
ng
f
etch:
do not leak
a
ref
s
pec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
J
uni
o
C Hamano
Gi
t
1
.
7
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
J
unio C Ham
a
no
Merge
branc
h
'
jk/maint-config-alias-
f
ix'
int
o
main
t
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
Hamano
Me
r
ge branch 'jc
/
fmt-req-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
u
n
i
o C Haman
o
Merge br
a
nc
h
'jk/
m
aint-d
o
cs' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
Hamano
Merge branc
h
'jn/doc-r
e
m
o
te-he
l
pers' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C Haman
o
Merge bra
n
ch 'kk/maint-prefi
x
-i
n
-config-mak'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-06-01
Jim Meye
r
ing
di
f
fcore-rename
.
c: avo
i
d set
-
b
ut-
n
ot-used warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
a
mano
S
tart 1
.
7
.
5
.
4 dr
a
ft relea
s
e
n
ote
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C H
a
man
o
Merge bran
c
h 'tr/add-i-no-escape' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ham
a
no
M
erg
e
b
r
anch 'v
h
/
c
onfig-inter
a
c
t
ive-sing
l
ekey
-
d
o
c'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Me
r
g
e
bran
c
h 'ml
/
test-r
e
adm
e
' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Haman
o
Merge branch 'a
b
/i18n-fi
x
up' into
maint
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
Haman
o
Merge
branc
h
'jc/ren
a
m
e-degrade-cc-to-c' into
maint
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
M
erge branc
h
'rr/doc-content-ty
p
e' into maint
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Nieder
Documenta
t
io
n
: do n
o
t mi
s
interpret refsp
e
cs
a
s b
o
ld
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C
H
ama
n
o
Merg
e
bran
c
h 'jm/ma
i
nt-mis
c
-fix' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C Hamano
Merge b
r
anch 'bc/maint-submodule-fix-pa
r
k
e
d' int
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch 'b
c
/maint-api-d
o
c-parked' into
maint
commit
|
commitdiff
|
tree
2011-05-30
J
unio
C
Hamano
Merge
branch 'jn/run-command-er
r
or-failure' into
m
aint
commit
|
commitdiff
|
tree
2011-05-27
Junio C
H
amano
config
.
mak
.
in: al
l
o
w
"configure --sys
c
onfdir
=
/else
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Ki
n
g
do
c
s:
f
ix some antique
exam
p
le output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: make sure
li
t
er
a
l
"->" isn't converted to arrow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
ng
docs: update sta
t
us
-
-por
c
e
l
ain format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f King
d
o
cs: minor grammar fi
x
es to git-sta
t
u
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
B
randon Ca
s
ey
git-submodu
l
e
.
sh: s
e
parate
p
arens by a
s
pace to
avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
B
randon
Casey
Docume
n
tation/t
e
ch
n
ical/api-diff
.
txt:
correct
name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
eff K
i
ng
rea
d
_
g
itf
i
l
e_
g
ently: use ssize_t to hold read result
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
remov
e
tests of al
w
a
ys-fa
l
s
e condition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
i
m
Meyerin
g
rerere
.
c: d
i
agnose
a corrupt MERGE_
R
R w
h
en hi
t
t
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Git 1
.
7
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
unio C
H
a
m
ano
Merge branch 'maint-
1
.
7
.
4' into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Ham
a
no
Merge bran
c
h 'jk/git-connection-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge branch 'js/ma
i
nt-s
e
nd-pack-state
l
ess-rpc-de
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Haman
o
Merg
e
branc
h
'
jk/maint-up
l
o
ad-pack-shal
l
ow' in
t
o mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
Hamano
Merge b
r
anch
'
jm/mai
n
t-diff-words-with-sbe' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Merg
e
b
r
anch 'kk/maint
-
prefix-in-c
o
nfig
-
mak' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Ham
a
no
Merge branc
h
'mg/diff-uiconfig
-
doc'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
H
a
mano
Merg
e
branch 'ft/gitweb-tar-with-gzip-n
'
into
maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio
C
Hama
n
o
Mer
g
e bran
c
h
'ss/doc-s
v
n
'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branc
h
'
jn
/
fo
r
m
a
t
-patch
-
d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge
branch 'jc/maint-paths
p
e
c
-stdin
-
and
-
cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Me
r
g
e branch 'jk/cherry-pick-ro
o
t-with-r
e
solve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Merge branch
'r
g
/copy
-
ge
c
os-use
r
name'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e branch 'fc/completion-zsh' into main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
M
e
rge branch 'jk/
g
it-
c
onnection-d
e
adlock-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge b
r
anch 'js/maint
-
s
e
nd-pack-
s
tatel
e
ss-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merg
e
branch
'svn-fe-maint' of
g
i
t
://re
p
o
.
or
.
cz/gi
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Juni
o
C Hamano
userformat_find_re
q
uireme
n
ts(): find r
e
q
uir
e
men
t
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-25
Nguye
n
T
hai N
g
o
c Duy
init/clo
n
e:
r
emove sho
r
t option -L and docum
e
nt --separat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Junio C H
a
man
o
ha
n
dl
e
_op
t
ions(): do not miscount
how many 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 K
i
n
g
config: always pars
e
GIT_CONFIG_PARAMETERS duri
n
g git_c
o
nfig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff
King
git_
c
onfig: d
o
n't
p
eek at global
c
o
nfi
g
_par
a
meters
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
J
e
ff Kin
g
config: make e
n
vironment parsing rout
i
nes st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jim Meyeri
n
g
do not read beyond end of malloc'd b
u
f
f
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Michael J
G
ruber
git
-
s
vn: Fix git
s
vn l
o
g
--show-commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
ama
n
o
Git
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Ni
e
der
p
rovid
e
a copy of
the LGPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
J
eff King
test core
.
gitproxy configu
r
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Raf
a
el Gi
e
s
c
hke
copy_gecos: fix not adding nlen t
o
l
en
when processi
n
g "&
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Thomas Rast
a
d
d
-
i: ignore terminal
e
scape sequences
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio
C Hamano
Merge b
r
an
c
h 'js/ma
i
nt-1
.
6
.
6-sen
d
-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Update draft
r
elea
s
e n
o
t
e
s
t
o
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge bra
n
ch 'jn/
m
ain
t
-format-patch-doc'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Me
r
ge branch 'ss/che
r
ry-pick-x-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C Hamano
Merge br
a
nch 'v
r
/merge-ba
s
e-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
r
anch '
s
r/maint-fas
t
-i
m
port-
t
ighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch
'
j
c/
t
1506-shell-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
ma
n
o
M
e
rge branch 'jc/fix-add-u-unmerged' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch '
j
n/gitweb-depe
n
dency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch 'jc/mai
n
t-
b
r
a
nch-mergeoptions' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merg
e
branc
h
'jc/ma
i
nt-add-p-overlap
p
ing-hu
n
k
s
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
D
o
cumentati
o
n/git-fsck
.
txt: fix typo: u
n
r
e
adable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next