repo.or.cz
/
alt-git.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 many-way octopus
2010-08-18
J
onath
a
n Nied
e
r
merge script:
h
andle many-way
o
ctopus
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge script: h
a
n
d
le -m --log
c
orrectly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
th
a
n
Nieder
merg
e
script:
f
orbid
m
e
rge -s in
d
ex
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge script: a
l
low cu
s
tom strat
e
gies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
Nied
e
r
me
r
ge script:
m
e
r
ge -X<option>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
ath
a
n Niede
r
merge script: improve log message subject
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Ni
e
der
merge script: refuse to merge
during
m
erg
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge s
c
ript:
t
we
a
k unmerged f
i
l
es me
s
sage to match
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nied
e
r
merge scri
p
t: --s
q
uash, -
-
ff from unbor
n
branch
a
re
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han N
i
eder
fmt-merge-msg -m to over
r
ide merge title
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge-
b
ase
-
-
independent to pr
i
nt reduced parent li
s
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
mer
g
e-base --octo
p
u
s
to mimic
show-branch --
m
erge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n N
i
eder
Docum
e
n
t
ation:
a
dd a SEE ALSO se
c
ti
o
n for merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200
(fmt-merge-msg): style nit
p
ick
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t6010 (
m
erge-bas
e
): moderni
z
e styl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
t7600 (mer
g
e
): test merge from
bran
c
h yet to
be born
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n
Nie
d
e
r
t7600 (merge):
check reflog entr
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nied
e
r
t7600
(merg
e
)
:
d
o not launch gitk for --debug
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (mer
g
e): moder
n
ize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
natha
n
Ni
e
der
m
erge: do not mistake (ancestor of) tag for branc
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jo
n
athan Ni
e
der
t
/
R
E
ADME: c
o
rrect an
e
xcept
i
o
n
w
h
en breaking a &
&
cha
i
n
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jon
a
than Nieder
Add
a
sample
u
s
e
r
f
or the s
v
nd
u
mp libra
r
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documentation
:
a
dd su
b
module
.
* t
o
the big c
o
nfigur
a
tion
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nie
d
er
gi
t
modul
e
s
.
5: u
r
l c
a
n be
a relat
i
ve path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Ni
e
der
git
-
-
pagi
n
ate
:
paginate
e
xter
n
al comma
n
ds agai
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t300
0
(
l
s-files -o): modernize styl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jona
t
han
Nieder
t9118 (git-svn)
:
prev
e
nt early failure from
t
aking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Nied
e
r
t/README: document
more tes
t
helpe
r
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonat
h
an Nieder
revert: do not rebu
i
ld ar
g
v on he
a
p
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jo
n
athan Nieder
tests: local
config fi
l
e sh
o
uld be honored
from subdi
r
s
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Ni
e
der
t7006
:
test p
a
ge
r
configuration for several git commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jona
t
ha
n
Nieder
t
7006 (pager): introduce h
e
lper for parameterized tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Niede
r
t3508 (c
h
erry-pick): f
u
tureproof against unmerged fil
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jona
t
han Nieder
git-svn
:
strip off
lead
i
ng sl
a
shes on --trunk argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonat
h
an
Nieder
add-
i
nteractive: Clarif
y
“r
e
mainin
g
h
unk
s
in
t
h
e file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan
Nieder
grep: refactor grep_objects
l
oop into
its own function
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
J
o
n
athan Nieder
Documentation/
c
he
c
kou
t
:
c
larify d
e
s
c
ription
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
rebase -i -p: document sh
o
rtco
m
ings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonat
h
an Nieder
DWIM 'git sho
w
-5' to 'git sho
w
--do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Niede
r
git
i
gn
o
re
.
5: Clarify ma
t
ching rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
o
nathan
N
i
eder
r
e
base: improve
e
r
r
or me
s
sag
e
wh
e
n upstream argume
n
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
o
nat
h
an
N
ieder
Documen
t
ation/checkout: c
l
a
r
i
fy
d
escription
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
J
onath
a
n N
i
eder
fsck: f
i
x
bo
g
us commit header check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan
N
ieder
Add git
remote set-branc
h
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonatha
n
Nieder
post-r
e
ceive-emai
l
: document
command-l
i
ne mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
g
it
svn: avoid uninitialized var in 'r
e
s
e
t
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han N
i
eder
Mak
e
file: let heade
r
dependency checker
o
verride COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nath
a
n
Nie
d
er
Makefile: fix header dependency check
e
r to
allow
NO
_
CU
R
L
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Do
c
ume
n
tation/notes:
nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Niede
r
Do
c
umenta
t
ion/n
o
tes: cle
a
n up description of r
e
wri
t
i
n
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Nieder
Documentation/no
t
es:
s
i
mplify
treatment of de
f
ault
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Nieder
D
ocu
m
entation/log: add a CONFIG
U
RATION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n
Niede
r
Documentation/not
e
s
:
sim
p
l
ify t
r
eatment of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentatio
n
/notes: ad
d
co
n
figuratio
n
s
e
c
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Nieder
Documentat
i
o
n
/no
t
e
s
: descri
b
e content of
n
otes blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
N
ieder
Docu
m
entation/notes
:
d
o
cument f
o
rmat of notes
trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
o
nathan
N
ieder
cherry-pick: do not dump core when iconv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jona
t
han Nieder
p
retty
:
initializ
e
new cm
t
_f
m
t_map
t
o 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonat
h
a
n Nieder
adapt req
u
est-pul
l
t
ests for new
pul
l
r
e
quest forma
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonat
h
an N
i
eder
te
s
t
-lib: some she
l
ls do
n
ot let $? propagate into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
shortlog:
Document and tes
t
-
-
format opti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n
N
ieder
t
42
0
1 (sho
r
tlog): Tes
t
output format with
m
ultiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n Nieder
t4201 (
s
hortl
o
g): guard setup
with t
e
st_expect_
s
uccess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n Niede
r
Documentation/shortlog: sc
r
ipted users should not rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Nieder
comm
i
t
--amend: co
p
e with mis
s
i
ng display
nam
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Nieder
test-l
i
b: Let tes
t
s spe
c
ify commands to b
e
run
a
t end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fsck: ch
e
ck ident lines in comm
i
t objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jo
n
at
h
an
N
i
eder
r
e
quest-pull: p
r
otec
t
again
s
t
OPT
I
ON
S
_KEEPDA
S
HDA
S
H
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
Nieder
tests for request-p
u
ll
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Niede
r
Documentation/Makefile
:
fix interrupted builds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fix
"bundle --stdin" segfau
l
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
o
n
a
than Nieder
t5704 (bundle
)
: add t
e
sts f
o
r
bundle --std
i
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nieder
tag
-
v: use RUN_GIT_C
M
D
to run verify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan N
i
eder
Document new "already-merged"
rule for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jona
t
han N
i
eder
A
d
d
.
de
p
end directories
to
.
gitignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
t7006
:
guar
d
clea
n
up with test_e
x
pe
c
t_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jona
t
han Nieder
t5800:
t
estgit helper requires
P
ython support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jona
t
han Nied
e
r
t7400: cla
r
i
f
y submodule update tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
on
a
t
h
a
n
N
i
ed
e
r
t7400:
clarify 's
u
bmodule
add' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
onathan Nieder
t7400: split setup into
m
ultiple
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
J
o
nathan Nieder
Te
a
ch
m
ailinfo %< as an
a
lterna
t
ive
scis
s
ors mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Niede
r
M
akefile: future-proof Cygwin version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
e
r
g
e
-
recu
r
sive: add
a
l
abel for ance
s
t
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
cherry-pick, reve
r
t: add a
label f
o
r an
c
estor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ied
e
r
r
e
v
e
r
t: clarify label
o
n con
f
lict hu
n
ks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat: add mem
p
c
p
y()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Niede
r
c
h
ecko
u
t -m -
-
conf
l
ict=
d
iff3: add a
l
abel for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
Niede
r
m
erge
_
trees():
add ancesto
r
label parame
t
er for
d
iff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
merge_file(
)
: ad
d
comment explaini
n
g behav
i
or wrt
confli
c
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
heckou
t
-
-c
o
nflict=dif
f
3: add a label for ances
t
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge(): add ancestor label par
a
meter
f
or diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-file --d
i
ff3
:
add a label for ance
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han
Nied
e
r
xdl_merge
(
): move
f
ile1
and file2 l
a
bels to
x
m
param
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
x
dl
_
merge(): add
optio
n
al an
c
estor label to diff3-
s
tyl
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
ha
n
Ni
e
der
test
s
:
document ch
e
rry-p
i
ck behavior in fa
c
e of conflict
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
t
e
s
ts: document forma
t
of c
o
nfl
i
cts fro
m
checkout -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
re
v
ert: fix tin
y
me
m
or
y
leak
in cherry-pic
k
--
f
f
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Ni
e
der
M
a
kef
i
le: Fix occasional GI
T
-CFLAGS br
e
akage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jon
a
th
a
n Nieder
M
a
kefile: Fix CDP
A
TH
p
r
o
blem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Niede
r
gitk: Do
n
't clobbe
r
"R
e
memb
e
r th
i
s
view
"
setti
n
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next