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: tweak unmerged files message to match builtin
2010-08-18
Jonathan Nie
d
er
mer
g
e
script
:
tweak u
n
merged files message to match
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Niede
r
merge script: --squa
s
h, --ff
f
rom
unborn branch are
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-mer
g
e
-
msg -m to override
m
erge tit
l
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
me
r
ge-base --independ
e
n
t to p
r
int r
e
du
c
ed pa
r
ent
l
ist
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merg
e
-base --oc
t
opus to mimic s
h
ow-bran
c
h --merge-base
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
an Nied
e
r
D
o
cumentati
o
n: add a
S
EE
ALSO sect
i
o
n
for
m
erge-base
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
t6200 (fmt
-
merg
e
-msg
)
:
style nitpi
c
ks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t60
1
0 (m
e
rge-base): modernize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nie
d
er
t76
0
0
(
merg
e
)
:
test merge
f
rom branch yet
t
o be
b
orn
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
N
i
eder
t
7
600
(m
e
rge): check reflog e
n
t
ry
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7
6
00 (merge
)
: do not launch git
k
f
o
r --debug
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t
7
600 (merge): mo
d
ernize
s
tyl
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
m
e
r
ge
:
do not mistake (
a
ncesto
r
of) ta
g
for bran
c
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
onat
h
an Nied
e
r
t/
R
E
A
DME: c
o
rrect a
n
exce
p
tion
whe
n
breaki
n
g a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonat
h
a
n Nieder
Add a sample user for
th
e
svndump library
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
tha
n
N
i
eder
Documen
t
a
tion: add submodule
.
* to the
b
ig
co
n
figu
r
ation
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonatha
n
Nieder
gitmod
u
les
.
5
:
u
r
l c
a
n be
a
relati
v
e path
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonat
h
an Niede
r
git --paginate: paginate external commands a
g
ain
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t
3000 (ls-fi
l
es -o): modernize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-08
J
onathan Nieder
t9118 (git-svn): prevent early
failure from taking
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jo
n
athan Nieder
t/README: document
m
ore test helpers
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-29
J
o
nathan Nie
d
er
revert: do not rebuild argv
o
n
h
eap
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
J
ona
t
han Ni
e
d
er
te
s
ts: loca
l
c
onfig fi
l
e should be honored fro
m
subdirs
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
J
o
n
athan N
i
e
de
r
t700
6
: test pager conf
i
guration f
o
r several git comma
n
d
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonath
a
n
N
i
eder
t7006 (pager
)
: intr
o
d
uce h
e
l
p
er for par
a
meter
i
zed tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Niede
r
t3508 (cherr
y
-pick): futureproof against unmerged files
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonatha
n
Nieder
g
it-sv
n
: strip off leadin
g
slashes on --t
r
unk argument
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
add-inte
r
ac
t
ive: Clar
i
fy “remaining hunks i
n
the file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Niede
r
grep: r
e
fac
t
or
g
r
e
p_obj
e
cts loop
i
nt
o
its own function
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
Documentation/chec
k
out: c
l
arify descriptio
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jon
a
t
han
N
ieder
rebase -i -p: doc
u
ment shortcomings
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan Nieder
DWIM 'gi
t
s
how -5' to 'git show
--do-walk -5'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonat
h
an
N
ieder
gitigno
r
e
.
5:
C
larify matching rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonath
a
n
Nieder
reb
a
se:
i
mprove error message
w
hen u
p
stream argument
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonatha
n
N
i
e
der
Documentati
o
n/
c
hecko
u
t: c
l
a
rify description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan N
i
eder
fs
c
k:
fix bogus co
m
mit
h
eader
c
heck
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jon
a
t
h
an Niede
r
Add g
i
t re
m
ote set-branches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jo
n
at
h
an Ni
e
der
po
s
t-r
e
ceive-email: document command-
l
ine m
o
de
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
ath
a
n
Nieder
g
it svn: avoid
u
n
initiali
z
ed var in 'r
e
set'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
eder
Makefile: let header depe
n
d
e
ncy c
h
ecker o
v
er
r
i
de COMPUTE_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onatha
n
Nieder
Ma
k
ef
i
le: fix hea
d
e
r depende
n
cy c
h
ecker t
o
allow NO_CURL
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
Docu
m
entation/notes: nitpicks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
i
ede
r
Documentat
i
on/notes
:
clean up description of
r
ewr
i
ting
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
athan Nieder
Document
a
tion/notes: simpl
i
fy tre
a
tment
o
f defaul
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
e
d
er
Documentation/log: add a CONFIGU
R
ATION secti
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
a
tha
n
Nied
e
r
D
ocumen
t
ation/not
e
s:
si
m
p
l
ify treatment
o
f
d
efault
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Nieder
Documentation
/
not
e
s: ad
d
configuration section
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nieder
Documentation/n
o
tes: d
e
scribe content of n
o
tes
b
lobs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an
N
ieder
Docu
m
entation/
n
o
t
es
:
document form
a
t of notes t
r
ees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jo
n
a
tha
n
Nieder
ch
e
rry-pick:
do not dump core when iconv fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nie
d
er
pretty: initialize
n
ew cmt_f
m
t_map to 0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jona
t
han Nieder
a
d
a
p
t
request
-
pu
l
l
tes
t
s for
n
ew pull re
q
uest format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nieder
test-l
i
b: some
shel
l
s do not let $? propagate into
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
at
h
an Ni
e
der
s
h
o
rtlo
g
: Document and test --format option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than
N
i
eder
t420
1
(shortl
o
g
)
: Test outp
u
t
f
ormat with multiple
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
Niede
r
t4201 (
s
hort
l
og):
g
uard setup w
i
th test_expec
t
_su
c
cess
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Nieder
Document
a
tion/shortlog: scrip
t
ed us
e
rs shou
l
d
not
rely
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Niede
r
commit
-
-amend: cope with
m
issing displ
a
y name
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than Nieder
test-lib: Let tests sp
e
cify
commands
t
o be run at
en
d
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fs
c
k: check ident lines in commi
t
objects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
J
o
nat
h
an Nie
d
er
r
e
q
u
e
st-pull: protect against OP
T
IONS
_
KEEPDA
S
HDASH
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jo
n
athan Nieder
test
s
for
r
eq
u
e
st
-
pull
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
Jo
n
ath
a
n Nieder
Document
a
tion/Makefi
l
e: fix interrupted builds of
u
s
er
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jo
n
at
h
an Ni
e
der
fix "
b
undle
--stdin" segfault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
t
5
7
0
4 (bundle): add tests
for
b
u
n
dle --stdin
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jon
a
than Nieder
tag
-
v: use RUN_GIT_CMD
t
o
r
u
n
verif
y
-tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jona
t
h
a
n
N
ieder
Document new "already
-
mer
g
ed" rule for branch -d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
n
a
than Nieder
Add
.
depend dir
e
ctories
to
.
g
i
tign
o
re
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nat
h
an Nied
e
r
t7006: guard clea
n
u
p with tes
t
_exp
e
ct
_
su
c
c
ess
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Nieder
t5800: testgit helper requires Python supp
o
rt
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonath
a
n Nieder
t7400: clarify submodule update te
s
t
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t74
0
0: clarify 'submodul
e
a
d
d
' tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t7
4
00: spl
i
t
s
e
t
up into multiple tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jo
n
athan
N
ieder
Teach
mailinf
o
%< as an a
l
ternative scisso
r
s
m
ark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jon
a
tha
n
Nieder
Makefile: future-proof Cygwin ve
r
sion check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-recursive:
add a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
cherry-pick, rever
t
: add a la
b
el for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
revert:
c
larify
label on conflict hunks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
compat: ad
d
mempcpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
che
c
kout
-
m --con
f
lict=diff3: add a lab
e
l for ances
t
or
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Ni
e
der
merge_trees(): a
d
d ancesto
r
lab
e
l parameter
f
or diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
merge_file():
a
dd comment explain
i
ng behavior wrt conflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
han
Nieder
checkout
-
-
c
onflict
=
diff
3
:
add a label for anc
e
stor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
ll_merge():
add ancestor labe
l
para
m
e
t
er
for
diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
ha
n
Nieder
m
e
rge-file
-
-diff3: add a label for ances
t
or
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge
(
): move file1
and file2 labels to xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xd
l
_merge(): add op
t
i
onal ancesto
r
label to diff3-
s
t
y
le
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
tests: document cherry-pick beha
v
ior in face of
conflicts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
e
der
t
e
sts: docum
e
n
t
format of con
f
licts from che
c
kout -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
an Nieder
revert: fix tiny me
m
ory leak in
c
herry-pick --ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
M
akefile:
Fi
x
occasiona
l
GIT-CFLAGS br
e
akage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
onat
h
a
n
Nieder
Mak
e
file:
F
i
x
CDPAT
H
problem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jon
a
t
h
an Nied
e
r
gitk: D
o
n't clobber
"
Remember this
v
i
ew" setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
gitk: Add comments to
ex
p
la
i
n encod
e
_view_o
p
ts and
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jonath
a
n Nieder
Makefile: cl
a
rify definition of TEST_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
J
o
nathan Nieder
a
m
:
remo
v
e
reba
s
e-apply di
r
ectory be
f
o
r
e gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
tes
t
s: F
i
x race condition in t7006-
p
ager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Nieder
t7006
-
pager:
if stdout is not a t
e
rminal,
m
a
ke a new on
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jon
a
than Nieder
te
s
ts: Add tes
t
s for
automatic use of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nie
d
er
am: Fix lau
n
ching of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next