1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 05:47:53 +01:00
git/contrib/examples
Junio C Hamano 5a4d707a6d Merge branch 'db/checkout'
* db/checkout: (21 commits)
  checkout: error out when index is unmerged even with -m
  checkout: show progress when checkout takes long time while switching branches
  Add merge-subtree back
  checkout: updates to tracking report
  builtin-checkout.c: Remove unused prefix arguments in switch_branches path
  checkout: work from a subdirectory
  checkout: tone down the "forked status" diagnostic messages
  Clean up reporting differences on branch switch
  builtin-checkout.c: fix possible usage segfault
  checkout: notice when the switched branch is behind or forked
  Build in checkout
  Move code to clean up after a branch change to branch.c
  Library function to check for unmerged index entries
  Use diff -u instead of diff in t7201
  Move create_branch into a library file
  Build-in merge-recursive
  Add "skip_unmerged" option to unpack_trees.
  Discard "deleted" cache entries after using them to update the working tree
  Send unpack-trees debugging output to stderr
  Add flag to make unpack_trees() not print errors.
  ...

Conflicts:

	Makefile
2008-02-27 12:53:26 -08:00
..
git-checkout.sh Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
git-clean.sh Make git-clean a builtin 2007-11-18 19:11:42 -08:00
git-commit.sh Merge branch 'kh/commit' 2007-12-04 17:16:33 -08:00
git-fetch.sh Merge branch 'master' into db/fetch-pack 2007-10-16 00:15:25 -04:00
git-gc.sh Supplant the "while case ... break ;; esac" idiom 2007-09-23 16:12:00 -07:00
git-ls-remote.sh Build in ls-remote 2007-11-05 12:25:42 -08:00
git-merge-ours.sh Merge branch 'maint' 2007-11-28 17:06:57 -08:00
git-reset.sh Merge branch 'maint' 2007-09-23 17:13:55 -07:00
git-resolve.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
git-revert.sh contrib: resurrect scripted git-revert. 2007-12-26 17:38:00 -08:00
git-svnimport.perl No longer install git-svnimport, move to contrib/examples 2007-10-30 21:36:29 -07:00
git-svnimport.txt No longer install git-svnimport, move to contrib/examples 2007-10-30 21:36:29 -07:00
git-tag.sh Officially deprecate repo-config. 2008-01-17 22:52:40 -08:00
git-verify-tag.sh Supplant the "while case ... break ;; esac" idiom 2007-09-23 16:12:00 -07:00