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
Add a second testcase for handling invalid strategies in git-merge
2008-07-30
M
iklos Vajna
Add a second te
s
tcas
e
for handli
n
g
i
nvalid strategies
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d a n
e
w test
f
or u
s
ing a custom merge strate
g
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
built
i
n-merge: allow using a
custom st
r
ategy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-help: m
a
ke some interna
l
functions available
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Alex
R
iesen
Make u
s
e
o
f
stat
.
ctime conf
i
gurable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Christian Coud
e
r
merge-ba
s
e: die
w
ith an error mes
s
a
ge if not passed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
t70
0
1: fix "
g
it mv"
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Jun
i
o C Ham
a
no
Documenta
t
ion:
c
lari
f
y
what
is show
n
in "gi
t
-l
s
-files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Stef
f
en Prohaska
run-command
(
Wi
n
dows): Ru
n
dashless "git <cmd>
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
S
t
e
f
fen Prohaska
R
efactor
,
adding prepare_git_c
m
d(const char **argv)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Ol
i
vier Marin
builti
n
-verif
y
-tag: f
i
x -v o
p
tion pa
r
sing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Jun
i
o C Hamano
ls-tree documentatio
n
: enhance
n
otes
o
n
subdirectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Haman
o
Allow instal
l
i
ng in the traditional way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hamano
Allow buildi
n
g without any git in
s
ta
l
led
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Jeff King
init:
handle e
m
pty "template" paramete
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Haman
o
GIT 1
.
6
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Petr Ba
u
dis
git-mv
:
K
eep
m
oved index
e
ntries ina
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Petr Baudis
git-mv: Rem
o
ve dead c
o
de
branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Shawn
O
.
Pear
c
e
fsck
:
Don't
r
equire t
m
p_obj_ file names are 14 bytes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Jo
h
a
n
nes Schindelin
Avo
i
d chdir(
)
in list_comma
n
d
s_in_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars
H
jemli
bu
i
ltin-
b
ranch: fix -v fo
r
--[no-]me
r
ged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
L
a
rs
Hjemli
builti
n
-branch: factor out merge_filter
m
a
t
ching
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hjemli
bu
i
lt
i
n
-
branch
:
rem
o
ve duplicated code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
B
jör
n
S
t
einbrink
rev-parse:
A
dd support for the ^! and ^@
synta
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio
C H
a
mano
make sure parsed wi
l
dcard refspec ends with slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Ja
k
ub Narebski
gitwe
b
: More about how g
i
tweb
g
ets
'
owner' of reposi
t
o
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Jo
n
athan Nieder
t6030
(
bisect): work around Mac OS
X
"ls"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
C
esar Edu
a
rdo Barros
Documentation/g
i
t-
s
ubmodule
.
txt: fix doubled word
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lee Ma
r
low
bash co
m
pletion: Add comp
l
e
tion for 'git
h
e
l
p'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Ande
r
s Melchiorsen
Documentati
o
n
:
fix di
f
f
.
externa
l
examp
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Thomas Rast
bash completio
n
: Add long o
p
t
i
ons
f
o
r
'
g
i
t d
e
scribe'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Abhijit Menon-Sen
Cla
r
ify
t
hat
"
git log x
.
c y
.
h"
lists commi
t
s tha
t
touch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C H
a
mano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-26
Ste
p
han Beyer
git-reset: Let -q hush
"
locally mo
d
if
i
ed" m
e
ssages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Brad
King
git-svn: te
a
ch dcommit about
s
v
n
aut
o
-pr
o
ps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
W
i
nd
o
ws: Do not compile
git
-
shell
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes S
i
x
t
Wi
n
d
ow
s
:
Make
s
u
re argv[0]
has a path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Windows: Make $(gite
x
e
c
dir) relative
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Joha
n
nes Sixt
Allo
w
add_path() to add non-exis
t
ent directories t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Joha
n
ne
s
Sixt
A
llow the
bu
i
l
t-in ex
e
c pat
h
t
o
be relat
i
v
e
to
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johan
n
es
Sixt
Fix relative built-in paths to be re
l
a
t
ive to the c
o
mmand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
J
o
ha
n
nes Sixt
Record the co
m
mand invoc
a
tion pa
t
h
earl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Six
t
Makefi
l
e:
N
orm
a
lize $(bindir)
a
nd $(gitexe
c
dir) before
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johan
n
e
s
S
i
x
t
Makefile: D
o
not
i
nstall a copy of
'
g
i
t' in $(gitexecdir)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene Sch
a
rfe
archive: allow --exec and --remote w
i
thout
e
q
ual si
g
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene Schar
f
e
ar
c
hive: declare stru
c
t archive
r
w
here it
'
s needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene
S
charfe
arc
h
ive: defin
e
MAX_ARGS wh
e
re it'
s
n
e
e
ded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
R
e
n
e
S
c
harfe
ar
c
hive: move
parameter parsing code to a
r
chive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
R
ene Sch
a
rfe
archive: add write_archive()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Steve
H
a
slam
Remove
r
eferences to git-fetch-pack from
"gi
t
c
l
one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Stephan
B
e
y
er
git
-
am: Mention --
a
bort
i
n
u
sage
s
tring pa
r
t of OPTIONS_SPEC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Steve H
a
slam
P
r
o
p
agate -u/-
-
upload-pack option of "gi
t
c
lone" to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Stepha
n
Bey
e
r
edito
r
.
c
: Libify launch_editor
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
St
e
pha
n
Beyer
Move launch_editor() fr
o
m
builtin-tag
.
c
t
o editor
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C
Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-07-25
Junio
C
H
aman
o
Doc
u
m
e
n
tat
i
on:
c
larif
y
how to dis
a
ble el
e
ments in co
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Makefile: fix shell quoting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
J
u
nio C Haman
o
tests: prop
a
gate $(TAR) down from
the
toplevel Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Björn
S
teinbrink
index-p
a
ck
.
c: correct
l
y initialize appe
n
ded objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
P
e
ter Val
d
emar Mørch
send-email: f
i
nd bo
d
y-encoding corr
e
c
tl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Jonatha
n
N
ieder
document that
git-tag can tag more
t
han heads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
B
rando
n
C
a
se
y
p
erl/Makefil
e
: update NO
_
PERL_MAKEMAKER section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
S
Z
EDER Gá
b
or
bas
h
:
o
ffer only paths after '--' for '
g
it
checko
u
t'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
S
ZED
E
R G
á
bor
checkout
:
mention '--'
i
n the
d
ocs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Merge br
a
nc
h
'ph/checkou
t
'
commit
|
commitdiff
|
tree
2008-07-25
P
i
erre Ha
b
ouzit
g
it-checkout: improve error messa
g
es, detect ambigu
i
ties
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Olivier
Marin
update test case to protect am --
s
kip behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Brando
n
Casey
Teach
f
s
c
k and prun
e
a
b
o
u
t
the new location of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Junio C Ham
a
no
Mer
g
e branch 'm
a
int'
into
p
h
/checkout
commit
|
commitdiff
|
tree
2008-07-24
Stephan Beyer
Make non
-
static
fun
c
tions,
t
hat
may be static, sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Junio C Hamano
ignore n
o
n-exist
e
nt ref
s
in
d
wim_log()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Thomas Rast
git-completio
n
.
bash: provide complet
i
on for 'sho
w
-branch'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Lee Marlow
bash
c
ompletion: Add long o
p
ti
o
ns for 'git rm'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
P
.
Chri
s
tea
s
sv
n
import: newer libsvn wa
n
ts
u
s to ask for the
r
oot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Petr Baudis
Documentat
i
on/g
i
t-filter-bra
n
ch: teach "rm" instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Schindel
i
n
git daemon:
a
vo
i
d
w
akin
g
u
p too often
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Schin
d
elin
builtin-commit: Two triv
i
al style-clean
u
ps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Jun
i
o
C Hamano
D
o
cumentation: clarify
d
iff --cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Ste
p
han Beyer
am --abort: Ad
d
to bash
-
completion an
d
mention i
n
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Petr Baudis
git
-
filt
e
r-bran
c
h
.
sh: Allow running in bare repositor
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio
C
Hamano
builtin-
b
r
a
nch
.
c: optim
i
z
e
--merged and --no
-
merged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
builtin-branch
.
c:
r
e
move un
u
s
e
d
code in ap
p
e
nd_ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Ha
m
an
o
s
t
a
sh save:
f
i
x par
a
met
e
r handli
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Step
h
an Beyer
g
it-a
m
: A
d
d colon befo
r
e the subject
t
h
at is printed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Pierre Habouzit
git-checkout: fix command line p
a
rsing
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
o
h
annes S
i
x
t
rebase -i: W
h
en a
n
'edit' stops
,
mention the commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Sch
i
ndelin
sort_in_topological_order(): avoi
d
setting a commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
o
hann
e
s Schinde
l
i
n
Ad
d
test
to show that s
h
ow-branch misses out the
8
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
oh
a
nnes Schindelin
I
g
nore dirt
y
submodule stat
e
s i
n
"
git pull
--
r
ebase"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Cas
e
y
t
/
t4202-lo
g
.
sh: add ne
w
line at
end of file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brandon
C
asey
t7502-commit
.
sh: rearrange test to make
mo
r
e
por
t
a
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brandon
C
asey
t3200,t720
1
: repla
c
e
'
!
'
wi
t
h test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
B
randon Casey
t41
1
6-apply-reverse
.
sh
:
use $TAR rather tha
n
tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Bran
d
on Casey
t
/: Replace
d
i
ff [-u|-U0]
with t
e
s
t_cmp
t
o
all
o
w compilation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601
:
e
x
tend the 'merge picks
u
p the b
e
st result'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Daniel
B
arkal
o
w
In perforce, RCS keyw
o
rds are
c
ase-se
n
sitive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Alex
R
i
e
sen
Allow pager
of diff co
m
mand be enabled
/
d
i
sabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Jo
h
annes Schindel
i
n
Fix two leftove
r
s from path_list->s
t
rin
g
_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
git am --sk
i
p: clean the index while
prese
r
v
i
ng local
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Pierre Hab
o
uzit
g
it-
s
ubmodule
:
move ill p
l
aced sh
i
ft
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next