repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge script: handle --no-ff --no-commit correctly
2010-08-18
J
o
nathan
N
ieder
merge script
:
h
andle --
n
o-ff --no
-
commit correctly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erg
e
script: --ff
-
only to disallow
t
r
u
e
m
e
r
ge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge scr
i
pt: handle many-way octopu
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge script: handle -m --l
o
g corre
c
tly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge sc
r
ipt: for
b
i
d
merge -s index
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nie
d
er
m
erg
e
script: allow
c
ustom strategies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: m
e
r
g
e -
X
<o
p
tion>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merge script
:
im
p
rove lo
g
mes
s
age subject
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
natha
n
Nieder
merge scrip
t
: refu
s
e to m
e
rge d
u
ring mer
g
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
merge
s
cript: t
w
eak unmerged
files me
s
sage to ma
t
ch
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge
s
cript: --squash,
-
-ff f
r
o
m
unborn
b
ranc
h
a
r
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
ath
a
n N
i
eder
f
m
t-mer
g
e-msg -m to override merge
title
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nied
e
r
merge-base --indepe
n
den
t
to print reduced parent list
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
merge-
b
ase
--octop
u
s
t
o mimic
show-branch --merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
Do
c
ument
a
tion: ad
d
a SEE ALSO
section for merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200 (fmt-merge-msg):
s
tyle nitpick
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6
0
10 (merge-base): modernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t
7
600 (m
e
rge): test merge from branch yet
to be born
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t7600 (merge):
check reflog entry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
t
7600 (merg
e
): do not la
u
nch gitk for --
d
ebug
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
han Nieder
t
7600 (m
e
r
ge): modernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Ni
e
der
merge:
do not mist
a
ke
(ances
t
or o
f
) tag for branch
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
J
onathan Nieder
t/README: correct an exception when breaking
a
&& chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
J
onatha
n
Nieder
Add a sam
p
l
e
user for th
e
svn
d
u
mp library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documentat
i
on: add submo
d
ule
.
* to the big configuration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonat
h
an Nieder
gitmodules
.
5: url can
be a
r
el
a
tive path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jona
t
han Nieder
git --paginate:
p
a
ginate
e
xternal commands a
g
ain
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t3000 (
l
s
-
fil
e
s
-
o):
mod
e
rnize styl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jon
a
th
a
n Nie
d
e
r
t91
1
8 (git-svn): prevent
early failure from ta
k
i
n
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan N
i
eder
t/R
E
ADME
:
document more te
s
t
helper
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
J
o
nathan Nieder
rev
e
rt: do not reb
u
il
d
argv on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Niede
r
tests: local config file should be honored fr
o
m sub
d
irs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t700
6
: test pager configu
r
a
t
ion for several
g
it comm
a
nds
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t7
0
06
(
p
ager):
introduce helper
f
or
p
a
rameterize
d
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
t
3
5
08 (cherr
y
-pick):
futureproof against unmerged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Niede
r
gi
t
-svn: strip of
f
lead
i
ng
slashe
s
o
n
--trunk argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
add-
i
nteractive: Clarify “remaining hunks
in the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
J
onathan Nieder
grep: refactor gre
p
_o
b
je
c
ts loop i
n
to it
s
own funct
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jo
n
athan Nied
e
r
Doc
u
mentation/checkou
t
: cl
a
r
i
fy descr
i
ption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
J
onat
h
an Nie
d
er
re
b
ase -i -p: document shortcomi
n
gs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan Niede
r
DWIM 'git
s
how -5' to 'git sh
o
w --do-walk
-
5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jona
t
han
Nieder
g
i
tignor
e
.
5: C
l
arify matching rule
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonatha
n
Nieder
rebase: improve
e
rro
r
mes
s
age wh
e
n upstream argument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Niede
r
Docum
e
ntati
o
n/checkout: clar
i
fy description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
J
o
nathan Nieder
fs
c
k:
f
ix bogus commit header
c
he
c
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
Add git remote set-bran
c
hes
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Ni
e
de
r
post-receive
-
email: docume
n
t
comman
d
-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han
N
ie
d
er
g
i
t
svn: avoid uniniti
a
lized v
a
r in 'reset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nied
e
r
Ma
k
efi
l
e:
l
et header depe
n
dency checker o
v
erride COMPUTE
_
HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an N
i
e
d
er
Makefile:
fix header depen
d
ency ch
e
cker to all
o
w NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nieder
Documentat
i
on/notes:
nit
p
icks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docu
m
entatio
n
/notes: clean
up
descripti
o
n of re
w
ri
t
ing
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
D
ocume
n
tation
/
notes: simplify t
r
eatment of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
D
o
cumentati
o
n/log: add a CONFIGUR
A
TION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/notes: sim
p
lif
y
t
r
eatm
e
nt of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n
Nieder
Documentatio
n
/not
e
s: a
d
d configuration secti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nie
d
er
Documentatio
n
/notes: describe conte
n
t of note
s
bl
o
bs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n N
i
ede
r
Doc
u
mentati
o
n/
n
otes:
d
o
cument format
of notes trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonath
a
n N
i
eder
cherry-p
i
ck
:
do not dump core wh
e
n
i
conv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
p
rett
y
: initialize new cm
t
_
f
mt_m
a
p to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jon
a
than
N
ieder
adapt req
u
est-
p
ull tests
f
o
r
ne
w
pull request fo
r
m
a
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nieder
t
est-lib:
some shell
s
do not l
e
t $?
propa
g
a
te
i
n
to
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
o
nathan Nieder
short
l
og: Document and test --format option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than
N
ieder
t4201
(shortlog): Tes
t
outp
u
t fo
r
mat with multi
p
l
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
ha
n
Nied
e
r
t420
1
(sho
r
tlog): guard setu
p
with test_expect_suc
c
ess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Ni
e
d
er
Documentation/shortlog: scrip
t
ed users should not rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan
Nie
d
er
commit
--amend: cope
w
ith
missing display name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
onathan Nieder
te
s
t-lib:
L
e
t te
s
t
s
specify commands to be run at end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonatha
n
Nieder
fsc
k
: ch
e
ck
ident
l
ine
s
in
c
ommi
t
obj
e
cts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nie
d
e
r
r
e
q
uest-p
u
ll: protect against OPTI
O
NS_KEEPDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
N
ie
d
e
r
tests f
o
r request-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
J
o
nathan Nieder
Documentation/M
a
kefil
e
:
f
ix
i
nterrupted
bu
i
lds of u
s
er
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fix "
b
undle --stdin"
s
eg
f
ault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jon
a
than Nieder
t570
4
(bundle):
ad
d
t
ests for bu
n
dle --stdi
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jona
t
ha
n
Nieder
tag -v: use RUN_GIT_CMD to run
verify-ta
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonat
h
an
Nieder
D
oc
u
me
n
t n
e
w "alread
y
-me
r
ged"
r
ule for b
r
anc
h
-d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan N
i
ede
r
Add
.
d
e
pend
d
irectories to
.
gitignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
t7006:
g
u
ard cleanup
w
ith
t
est_e
x
p
ect_succ
e
ss
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Nieder
t5800:
testg
i
t
he
l
per requires Python
s
upport
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
an N
i
e
d
er
t7400:
clarify
s
ubmo
d
ule updat
e
t
e
sts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan
Ni
e
der
t
7400
:
clarify 'submodule
add'
t
e
sts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
t
han Nieder
t7400:
split set
u
p in
t
o multi
p
le tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
J
o
nathan Nied
e
r
Teach
m
aili
n
fo %< as an al
t
ernative scissors mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
J
onathan Nied
e
r
M
a
kefile:
f
u
t
ure-
p
roof
C
ygwi
n
ve
r
sion check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-recurs
i
ve: ad
d
a label
f
o
r ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
cherry-p
i
ck,
r
evert:
add
a
l
abe
l
f
or a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
de
r
r
e
vert: clarify label on conflict h
u
nks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
compat: ad
d
mempcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Niede
r
checkout -m --confli
c
t=diff3
:
add a
label for an
c
es
t
or
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Niede
r
merge_trees(): add ance
s
tor la
b
el par
a
meter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nie
d
er
merge_file(): ad
d
comment explaining behavior wrt conflic
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
chec
k
out --confli
c
t
=di
f
f3: a
d
d a labe
l
for a
n
c
estor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
ll
_
merge()
:
add ancest
o
r
l
abel
parameter
f
or dif
f
3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
erge-f
i
le
--diff3:
a
dd a label for
a
nce
s
t
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
x
dl_merge(): move file1
a
nd fi
l
e2 labe
l
s
to xmparam
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge(): add optio
n
al ancestor
label to diff3-sty
l
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
e
d
er
tests:
d
ocument cherry-pic
k
be
h
avior i
n
f
a
ce o
f
confl
i
cts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
tests: document format
o
f co
n
f
licts
from che
c
kou
t
-
m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan
N
ieder
rev
e
rt: fix ti
n
y memory leak in cherry-pick --ff
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonat
h
an Nieder
M
a
ke
f
ile: Fix occasional GIT-CFLAGS breakage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next