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: refuse to merge during merge
2010-08-18
J
onathan
N
i
e
der
merge scrip
t
: refuse to merge d
u
ring
merge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
m
erge script: 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
Jon
a
than Nieder
merg
e
script: --squash, --ff from unborn branch a
r
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ie
d
e
r
f
m
t-merge-ms
g
-m to override merge tit
l
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nat
h
an Ni
e
de
r
m
erge-base --indep
e
ndent to pri
n
t reduce
d
par
e
nt list
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onath
a
n
Nieder
merge
-
base --octopus to mimic show
-
branch --merg
e
-base
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nied
e
r
Doc
u
mentation: add a SEE ALSO sect
i
on for merge-ba
s
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t
6
2
0
0 (f
m
t-merg
e
-
msg):
st
y
le nitpicks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan N
i
eder
t6010 (me
r
ge-base):
m
odernize s
t
yle
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
t7600 (merge
)
: test merge from branch
ye
t
to be born
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an N
i
eder
t
7
60
0
(merge): che
c
k reflog
e
nt
r
y
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
e
d
er
t760
0
(merge
)
:
do not launch gitk for --debu
g
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nie
d
er
t7600 (merge):
modernize st
y
le
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge
:
do not mistak
e
(ancestor of) tag
f
o
r
branch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonath
a
n Ni
e
der
t/README: correct
an
e
xception when b
r
eaki
n
g a &&
chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
Add a
s
a
m
ple use
r
for the s
v
ndump libra
r
y
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
athan Nie
d
er
Documentation: add submodule
.
*
t
o the big configuratio
n
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
Nieder
gi
t
mod
u
les
.
5: url can be
a
relative path
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
o
n
athan Nieder
git --pag
i
nate: pagin
a
te ex
t
ern
a
l c
o
mmands again
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nie
d
er
t3000 (ls-files -o): modernize st
y
le
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-08
Jonat
h
an
Nieder
t9118
(
git-svn):
p
revent early failure from taking
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jon
a
than
Nieder
t/README:
document more tes
t
help
e
r
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nieder
revert: do not rebu
i
l
d
argv on he
a
p
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
Niede
r
tests: local
co
n
fig file sh
o
u
l
d be honored from subdirs
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jon
a
t
ha
n
Nieder
t7
0
06: tes
t
page
r
configuratio
n
for several git c
o
mmands
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nied
e
r
t7006 (pag
e
r)
:
i
n
troduce helper for parameterized
tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonatha
n
N
i
eder
t3508
(ch
e
r
ry-p
i
c
k): futu
r
e
proof against unme
r
ged fil
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonath
a
n Nieder
g
i
t
-
svn: strip of
f
l
e
ading sl
a
shes
o
n --t
r
unk argu
m
ent
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonath
a
n
Nieder
add-interactive: C
l
arify “remaining h
u
nks in the file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan
Nie
d
er
grep: refac
t
or grep_objects loop int
o
its
o
wn function
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nied
e
r
Documentati
o
n/checkout: cl
a
rify descrip
t
io
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonat
h
an Nied
e
r
rebase -i -p: do
c
ument shor
t
coming
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
J
o
nathan Nieder
DWIM 'gi
t
show -5' to 'git
s
how --d
o
-walk -5'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonatha
n
Nie
d
er
gitignor
e
.
5: Clarif
y
matching r
u
l
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
rebase: i
m
prove error message when
upstream a
r
gument
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Docum
e
nta
t
ion/checkout: clarify des
c
ription
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
fs
c
k
:
fix bogus commit header check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
J
o
nathan Nieder
Add
g
it r
e
mote s
e
t-branches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jona
t
ha
n
Ni
e
der
p
ost-rece
i
v
e
-
email: document command-line mode
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Nieder
git svn: avoid u
n
i
n
i
t
ialized var in 'reset'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Makefile: let he
a
der depe
n
dency
c
hecker override CO
M
PUTE
_
HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than
Nieder
Makef
i
le:
fix header dependen
c
y
c
hecker to allow NO_CURL
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
eder
Documen
t
ation/n
o
te
s
: nitpick
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
er
D
ocumentation/
n
otes: cle
a
n
u
p
description of r
e
w
r
iting
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
D
o
cumentati
o
n/notes:
s
implify trea
t
me
n
t of default
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Niede
r
D
ocumenta
t
ion/log: add
a CONFIGUR
A
TION secti
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nie
d
er
Documentation/notes: sim
p
lify
t
reatment
o
f defau
l
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/not
e
s: a
d
d configurat
i
on section
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han N
i
eder
Documentati
o
n
/
notes:
d
e
s
c
ribe
c
o
ntent of notes blobs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Do
c
umentation/notes: do
c
u
m
en
t
format of n
o
tes trees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jona
t
han Niede
r
cherry-pick: do n
o
t
dump core wh
e
n
iconv fa
i
ls
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nied
e
r
p
r
etty:
i
nitia
l
i
z
e new cmt_fmt_
m
ap to
0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Niede
r
adapt
request-pull tests f
o
r new
p
ull request
format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
J
ona
t
han Ni
e
der
test-lib:
s
ome
s
hell
s
do not let $?
pr
o
pagate into
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than Nieder
shortl
o
g: Docu
m
ent
a
nd test
--f
o
rmat opt
i
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t4201 (shortl
o
g):
Test output format with mul
t
iple
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t42
0
1 (sh
o
rt
l
og
)
: guar
d
setup
w
ith test_
e
xpe
c
t
_
success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than
N
i
e
der
Docume
n
tation/
s
ho
r
tlog: script
e
d
us
e
rs should not rely
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
a
t
h
an Nieder
co
m
mit
--amend: cope with mi
s
sin
g
displa
y
name
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
test-lib: L
e
t tests specify co
m
mands
t
o
be
run at e
n
d
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
Nieder
fsck: ch
e
ck ident
lines in commit objects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonatha
n
N
ieder
reques
t
-pull: protec
t
a
g
ainst OPTIONS
_
KEEPDASHDAS
H
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jon
a
than Nieder
tests for reque
s
t-pu
l
l
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
J
onathan Nieder
D
o
cumentation/Makefi
l
e: f
i
x interru
p
ted builds of use
r
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
f
ix "bun
d
le
-
-stdin" segfaul
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Niede
r
t5704 (bun
d
le): add tests for bundle --stdin
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jona
t
han Nieder
tag -v: use RUN_GIT_CMD to run verify
-
tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
n
athan Nieder
Document
new "a
l
ready-merged" ru
l
e f
o
r branch -d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jo
n
a
t
han Nieder
Add
.
d
e
pend directories
t
o
.
gitignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jona
t
han Ni
e
d
e
r
t7
0
06: gua
r
d
cleanup with t
e
st_expect_success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan N
i
eder
t5800
:
te
s
tgit h
e
l
per requires P
y
thon support
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
a
n
Nieder
t74
0
0: clarify su
b
module
updat
e
t
ests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t7400:
c
l
a
rify 'submodule add' t
e
s
ts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t
7
400:
s
p
l
i
t
setup i
n
to multiple tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nie
d
e
r
Teach mailin
f
o %
<
as
a
n
alternati
v
e scissors mark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jonatha
n
Ni
e
der
Make
f
ile: future
-
p
roof Cygwin versio
n
check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
erge-recursiv
e
: add a label for ances
t
or
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nied
e
r
cher
r
y-pick, revert: add a labe
l
for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
revert:
c
larify label on conflict hu
n
ks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
comp
a
t: ad
d
mempcpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Nie
d
e
r
c
h
eckout -
m
--c
o
nfl
i
ct=diff3:
add a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n N
i
eder
merge_trees():
a
dd a
n
cestor label parame
t
e
r
for dif
f
3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
merge_file(): add comment expla
i
n
i
n
g
behav
i
o
r
w
r
t confl
i
c
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
ath
a
n
Nieder
checkout --con
f
lict=diff3
:
add a label for an
c
e
sto
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Nieder
ll_merge()
:
a
d
d anc
e
st
o
r label parameter
f
or diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
t
h
an Nieder
merg
e
-file --diff3:
add a label
for a
n
cestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
xdl_
m
erge(): move file
1
and file2
l
a
b
els to xmpa
r
am
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_
m
erg
e
(): add o
p
t
ional ances
t
or label to dif
f
3-s
t
y
le
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Niede
r
tests: docume
n
t cherry-pick
behavior in
fac
e
o
f conflicts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests:
d
ocument format o
f
confl
i
cts
from checko
u
t -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
re
v
ert: f
i
x
tiny memory l
e
ak in
cherry-pick --f
f
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
M
akefile: Fix occa
s
ional GIT-CFLAGS breakage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
on
a
than Niede
r
Makefile: Fix CDPATH problem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan Niede
r
gitk: Don't clobber "Rememb
e
r
t
h
is view" setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
gitk: Ad
d
c
o
m
men
t
s t
o
explain
e
nc
o
de_view_op
t
s a
n
d
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Nieder
Ma
k
efile: clar
i
fy definition of
TEST_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
J
onathan Nie
d
er
am: remove rebase-apply direct
o
ry before gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
J
onathan Ni
e
der
tests: Fix race conditio
n
i
n
t
7
006-pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
J
on
a
than Niede
r
t7006-pager: if
s
tdout
is not a terminal, ma
k
e a ne
w
one
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonathan Ni
e
der
tests: Add
t
es
t
s
f
or automatic use of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next