ThinkPad-T420s:~/kaldi-trunk$ git add .
ThinkPad-T420s:~/kaldi-trunk$ git commit -m "full directory"
On branch master
Your branch and 'origin/master' have diverged,
and have 7555 and 30 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working directory clean
ThinkPad-T420s:~/kaldi-trunk$ git pull
X11 forwarding request failed on channel 0
error: The following untracked working tree files would be overwritten by merge:
	egs/deltas/s5/data/lang/G.fst
	egs/deltas/s5/data/lang/L.fst
	egs/deltas/s5/data/lang/L_disambig.fst
	egs/deltas/s5/data/lang/oov.int
	egs/deltas/s5/data/lang/oov.txt
	egs/deltas/s5/data/lang/phones.txt
	egs/deltas/s5/data/lang/phones/align_lexicon.int
	egs/deltas/s5/data/lang/phones/align_lexicon.txt
	egs/deltas/s5/data/lang/phones/context_indep.csl
	egs/deltas/s5/data/lang/phones/context_indep.int
	egs/deltas/s5/data/lang/phones/context_indep.txt
	egs/deltas/s5/data/lang/phones/disambig.csl
	egs/deltas/s5/data/lang/phones/disambig.int
	egs/deltas/s5/data/lang/phones/disambig.txt
	egs/deltas/s5/data/lang/phones/extra_questions.int
	egs/deltas/s5/data/lang/phones/extra_questions.txt
	egs/deltas/s5/data/lang/phones/nonsilence.csl
	egs/deltas/s5/data/lang/phones/nonsilence.int
	egs/deltas/s5/data/lang/phones/nonsilence.txt
	egs/deltas/s5/data/lang/phones/optional_silence.csl
	egs/deltas/s5/data/lang/phones/optional_silence.int
	egs/deltas/s5/data/lang/phones/optional_silence.txt
	egs/deltas/s5/data/lang/phones/roots.int
	egs/deltas/s5/data/lang/phones/roots.txt
	egs/deltas/s5/data/lang/phones/sets.int
	egs/deltas/s5/data/lang/phones/sets.txt
	egs/deltas/s5/data/lang/phones/silence.csl
	egs/deltas/s5/data/lang/phones/silence.int
	egs/deltas/s5/data/lang/phones/silence.txt
	egs/deltas/s5/data/lang/phones/wdisambig.txt
	egs/deltas/s5/data/lang/phones/wdisambig_phones.int
	egs/deltas/s5/data/lang/phones/wdisambig_words.int
	egs/deltas/s5/data/lang/phones/word_boundary.int
	egs/deltas/s5/data/lang/phones/word_boundary.txt
	egs/deltas/s5/data/lang/tmp/CLG_1_0.fst
	egs/deltas/s5/data/lang/tmp/CLG_3_1.fst
	egs/deltas/s5/data/lang/tmp/LG.fst
	egs/deltas/s5/data/lang/tmp/disambig_ilabels_1_0.int
	egs/deltas/s5/data/lang/tmp/disambig_ilabels_3_1.int
	egs/deltas/s5/data/lang/tmp/ilabels_1_0
	egs/deltas/s5/data/lang/tmp/ilabels_3_1
	egs/deltas/s5/data/lang/topo
	egs/deltas/s5/data/lang/words.txt
	egs/deltas/s5/data/local/corpus.txt
	egs/deltas/s5/data/local/lang/align_lexicon.txt
	egs/deltas/s5/data/local/lang/lex_ndisambig
	egs/deltas/s5/data/local/lang/lexicon.txt
	egs/deltas/s5/data/local/lang/lexiconp.txt
	egs/deltas/s5/data/local/lang/lexiconp_disambig.txt
	egs/deltas/s5/data/local/lang/nonsilence_phones.txt
	egs/deltas/s5/data/local/lang/optional_silence.txt
	egs/deltas/s5/data/local/lang/phone_map.txt
	egs/deltas/s5/data/local/lang/silence_phones.txt
	egs/deltas/s5/data/local/tmp/lm.arpa
	egs/deltas/s5/data/local/tmp/vocab-full.txt
	egs/deltas/s5/data/local/words.txt
	egs/deltas/s5/data/test/.backup/cmvn.scp
	egs/deltas/s5/data/test/.backup/feats.scp
	egs/deltas/s5/data/test/.backup/spk2utt
	egs/deltas/s5/data/test/.backup/text
	egs/deltas/s5/data/test/.backup/utt2spk
	egs/deltas/s5/data/test/.backup/wav.scp
	egs/deltas/s5/data/test/cmvn.scp
	egs/deltas/s5/data/test/data/cmvn_test.ark
	egs/deltas/s5/data/test/data/cmvn_test.scp
	egs/deltas/s5/data/test/fbbh/an86-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/an87-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/an88-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/an89-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/an90-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/cen1-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/cen2-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/cen3-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/cen4-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/cen5-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/cen6-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/cen7-fbbh-b.sph
	egs/deltas/s5/data/test/fbbh/cen8-fbbh-b.sph
	egs/deltas/s5/data/test/feats.scp
	egs/deltas/s5/data/test/ffmm/an291-ffmm-b.sph
	egs/deltas/s5/data/test/ffmm/an292-ffmm-b.sph
	egs/deltas/s5/data/test/ffmm/an293-ffmm-b.sph
	egs/deltas/s5/data/test/ffmm/an294-ffmm-b.sph
	egs/deltas/s5/data/test/ffmm/an295-ffmm-b.sph
	egs/deltas/s5/data/test/ffmm/cen1-ffmm-b.sph
	egs/deltas/s5/data/test/ffmm/cen2-ffmm-b.sph
	egs/deltas/s5/data/test/ffmm/cen3-ffmm-b.sph
	egs/deltas/s5/data/test/ffmm/cen4-ffmm-b.sph
	egs/deltas/s5/data/test/ffmm/cen5-ffmm-b.sph
	egs/deltas/s5/data/test/ffmm/cen6-ffmm-b.sph
	egs
Aborting