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
Joha
n
nes Sixt
string-li
s
t
: Add
A
P
I t
o
remove an i
t
em
f
rom a
n
unsor
t
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e
-
rec
u
r
sive: Sp
l
it w
a
s_
t
racked() out
o
f would_lose_unt
r
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
s
i
ve: Save D/F c
o
n
f
lict filenames in
s
tead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
Newren
merge-r
e
cur
s
i
ve: Fix co
d
e chec
k
i
n
g
fo
r
D
/F conflic
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
m
erge-r
e
cursive: Fi
x
sorting order and direct
o
ry chan
g
e
.
.
.
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
merg
e
-recu
r
sive: Fix recursive case with D/F conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-re
c
ursive: Avoid wor
k
ing dire
c
tor
y
changes during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
m
e
rge-recursi
v
e: Rem
e
mber to free g
e
n
erated unique
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ew
r
en
mer
g
e-recursi
v
e: Consolidate different update_stages
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-rec
u
rsive: Mark some dif
f
_filespec
struct arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
ewren
merge-re
c
ursive:
C
o
r
rect a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: Ma
k
e BUG mes
s
age more legible by addi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newr
e
n
t6022: Add tes
t
case for mergin
g
a renamed
f
ile
wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
02
2
: New
t
e
s
t
s
checking for unneces
s
ary u
p
dates o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6022: Remo
v
e unnecessary u
n
t
rack
e
d fil
e
s
to make
t
e
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newre
n
t6036: criss-cro
s
s + ren
a
me/r
e
name(1to2)/add-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
036: cr
i
ss
-
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 Newr
e
n
t6036
:
tes
t
s
f
or cr
i
ss-cross
m
e
rges w
i
t
h
v
a
r
i
ous directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6
0
36: cr
i
ss-cr
o
s
s
with weird
content can fool g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036:
Add
d
i
fferently r
e
s
o
l
v
ed
m
o
d
ify
/
d
e
le
t
e conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t
60
4
2: Add fail
i
ng testcases for rename/rename/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
ewre
n
t6042: Ensure rename/rename c
o
nfl
i
cts leave inde
x
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6042:
A
dd t
e
sts for content issues
with modif
y
/rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah N
e
wren
t6042: Add
a testcase where undetected rename
cause
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042:
Add
a
pair of
c
ases
w
here un
d
etected renames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6042: A
d
d failing testc
a
se for re
n
ame/modify/add-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6042: Add a testcase where g
i
t d
e
l
ete
s
an untr
a
cked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim Meyering
fetch: do
n
o
t leak a
r
efspec
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
Junio
C
Hamano
M
erge bran
c
h
'jk/m
a
int-conf
i
g-a
l
i
as-
f
i
x' in
t
o
maint
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
i
o
C Hamano
Merge
b
ranch 'j
c
/f
m
t-req-f
i
x'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge br
a
nch 'jk/maint
-
docs' i
n
to
maint
commit
|
commitdiff
|
tree
2011-06-01
J
u
n
io C Haman
o
Merge branch 'jn/
d
oc
-
remo
t
e
-
helpe
r
s
' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
u
n
io C Hama
n
o
Merge branch
'
k
k
/maint-prefix-in-config-mak
'
into m
a
int
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyeri
n
g
d
i
ffcore-rename
.
c: avoid s
e
t-
b
ut-not-used warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
amano
Start 1
.
7
.
5
.
4
draft release note
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch 'tr/add-i-n
o
-escape' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-31
J
u
n
io
C Hama
n
o
Merge
b
r
anch
'v
h
/c
o
nfig-
i
n
teractive-singleke
y
-do
c
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o
C Hamano
Merge br
a
nch 'ml/t
e
st
-
readme' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C H
a
mano
Merge branc
h
'ab/i18n
-
f
i
xup' into
maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
M
e
rge branch '
j
c/rename-degrade-cc-to-c' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C Hamano
Merge branch 'rr/doc-content-type' into maint
commit
|
commitdiff
|
tree
2011-05-30
J
onathan Nieder
D
o
c
umentation: do not mi
s
interpret refspecs a
s
bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
M
erge
b
ranch 'jm/mai
n
t-misc
-
fix' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C
Hamano
M
e
rge
b
ranch
'bc/maint
-
submodule
-
fix-p
a
r
ked' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Hamano
Merge branch 'bc/maint-api-doc-park
e
d' into maint
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C Ham
a
no
Merge branch 'jn/r
u
n-command-error-fail
u
r
e
' int
o
maint
commit
|
commitdiff
|
tree
2011-05-27
J
u
nio C Hamano
co
n
fig
.
mak
.
in: allow
"
configure -
-
sysconfdir=/else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
King
docs:
f
ix
some anti
q
u
e
example output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
docs: make sure literal "->" isn
'
t converted
t
o arrow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs:
u
p
date statu
s
--porc
e
lain format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: mi
n
or gramma
r
fixes
t
o gi
t
-st
a
t
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon
Casey
g
i
t
-submodule
.
s
h
: sep
a
rate parens by a space to
a
v
oi
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Bran
d
o
n Casey
Documenta
t
ion/technical/api-
d
iff
.
txt
:
correct name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_gitf
i
l
e_gen
t
ly: use
ssize_t to h
o
ld read
r
esul
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Ji
m
M
e
yering
remove tests of al
w
ays-false co
n
d
ition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
i
m Meyering
r
e
rere
.
c
: diag
n
ose a corrupt
M
ERGE_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
H
amano
Merge
b
ranch '
m
ain
t
-1
.
7
.
4' into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
Hamano
Merge branch
'jk/git-con
n
ection-de
a
d
l
o
c
k
-
fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge br
a
nch
'js
/
m
a
int-se
n
d-pack-stateless-rpc-dea
d
lock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o
C
H
a
mano
Merge branch 'jk/mai
n
t-up
l
oad-pack-sh
a
ll
o
w' into maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
H
amano
Merge branc
h
'j
m
/maint
-
diff-words-with-sbe'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Me
r
ge branch 'kk/m
a
int
-
pre
f
ix-in-config-mak' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge branch 'mg/diff-uiconfig
-
doc'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bran
c
h 'ft/gitw
e
b-tar
-
with
-
gzip-n' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge
branch 'ss/doc-sv
n
' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Merge bran
c
h 'jn/
f
ormat-pat
c
h-doc
'
into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Merge branch
'
jc/m
a
int-pa
t
h
s
p
ec-stdin-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Me
r
ge
b
r
a
nc
h
'j
k
/
c
herry
-
pi
c
k-root-with
-
r
esolve
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
uni
o
C Ham
a
no
Merge b
r
anch
'rg/
c
opy-gecos
-
us
e
r
name' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Ha
m
ano
Merge
bran
c
h
'fc/completion-zsh' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merg
e
branch '
j
k
/gi
t
-conn
e
ction-
d
eadlock-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge b
r
anch
'
js/m
a
i
n
t-send-pac
k
-statel
e
ss-rpc-deadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge branch 'svn
-
fe-
m
a
i
nt' of git://r
e
po
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Juni
o
C Ha
m
ano
userformat_find_requirements(): find req
u
ire
m
e
nt fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen T
h
ai
N
goc Du
y
init/clone: re
m
ov
e
s
hort
option
-L a
n
d doc
u
men
t
--
s
e
p
a
ra
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio C Hamano
handle
_
options
(
): do not misco
u
nt how many argume
n
t
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
Jeff
K
ing
config: al
w
ays parse
GIT_CONFIG_P
A
RAMET
E
RS
du
r
ing
git_con
f
ig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
git_confi
g
: do
n
't peek a
t
g
l
obal config_param
e
ters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
J
e
ff King
config: make environment parsing r
o
utines stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
i
m Mey
e
ring
d
o not
r
ead beyond end of
m
alloc'd
buf
f
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Mi
c
hael J Gruber
git-svn: Fix git svn
l
og --s
h
ow-commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Gi
t
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jona
t
han Nieder
provide a copy of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
te
s
t cor
e
.
g
itproxy con
f
iguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Rafae
l
Gieschke
copy_gecos: fi
x
not ad
d
ing nle
n
to len when
p
r
ocessing
"&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Thomas Rast
a
d
d
-i: ignore terminal escape sequences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Jun
i
o
C
Ha
m
ano
Merge branch 'js/maint-1
.
6
.
6-send-pack-
s
tatel
e
ss-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
a
mano
Update
d
ra
f
t r
e
le
a
se notes
t
o 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
br
a
nch 'j
n
/maint
-
format-pa
t
c
h-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Me
r
ge
b
r
anch 'ss
/
cherry-p
i
ck-
x
-doc' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
g
e br
a
nch 'vr
/
merge-base-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Ham
a
no
M
e
r
ge br
a
nch 'sr/m
a
int-
f
ast-import-tighten-op
t
ion-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bra
n
c
h
'jc/t1506-shell-p
a
r
am-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io
C
Hamano
Merge
b
ranch 'jc/fix-add
-
u-
u
n
merged' into main
t
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge
b
ran
c
h 'jn/gitw
e
b-
d
epend
e
ncy'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge bra
n
ch
'
j
c
/maint-branch-merge
o
ptions' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge bra
n
ch 'jc/main
t
-add-p-overlapping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Documentation/git-fsck
.
txt: fix typo: unreadable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next