version-gen: cleanup

No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
version-gen: fix versions

Virtually all packaging guidelines would prefer 1.8.4~rc1, over
1.8.4.rc1 or 1.8.4-rc1, so it makes sense to use that instead.

In particular, the only packaging we provide, git.spec, generates a
wrong version, because git-1.8.4 < git-1.8.4.rc1, changing to ~rc1 fixes
the problem as it's considered newer.

The same happens in dpkg.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
commit: support for multiple MERGE_MODE

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
merge: add --reverse-parents option

It would be useful to make `git update` reverse parents as desired.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Add new `git update` tool

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
travis: trivial cleanup

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Revert pull ff-only changes

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
doc: trivial fix to `git pull`

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Merge branch 'fc/update' into fc/master

* fc/update:
  Add new `git update` tool
  merge: add --reverse-parents option
  commit: support for multiple MERGE_MODE
remote-hg: simplify hg-git regex

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
doc: trivial cleanup for `git pull`

The user doesn't need to be burdened with irrelevant details.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
config: avoid yoda conditions

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
add: avoid yoda condition

18 is younger than person's age.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
contrib: svn-fe: fix python shebang

It's better if all our scripts use the same '/usr/bin/env python'.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Merge branch 'fc/trivial' into fc/master

* fc/trivial:
  contrib: svn-fe: fix python shebang
  add: avoid yoda condition
  config: avoid yoda conditions
  doc: trivial cleanup for `git pull`
Merge branch 'fc/version-fix' into fc/master

* fc/version-fix:
  version-gen: fix versions
  version-gen: cleanup
Fixes and cleanups from 'publish' branch

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
update: remove debugging cruft

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>